diff options
| author | Ayush Sharma <ayushsha@google.com> | 2023-10-10 17:19:44 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-17 02:42:34 +0000 |
| commit | a1e65efc8f3a710603cb975b1eec7ddbee1dd362 (patch) | |
| tree | efda19a751c210b7311712fe9b69145c0c3fd331 | |
| parent | eab387346443f4d8eff986f9a5363556df342924 (diff) | |
| download | base-a1e65efc8f3a710603cb975b1eec7ddbee1dd362.tar.gz | |
Handle error connecting to KeychainService
Bug: 210537972
Test: NA
(cherry picked from commit a93b4fdfbe4494ae32c76d4e8c1deae1718d7a0a)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:82e838218f45e0af3365f3b5fe4d6346b8ad7a41)
Merged-In: If2f41aea48ac9284ad205debb878d633072431f4
Change-Id: If2f41aea48ac9284ad205debb878d633072431f4
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index ecd3fdb3d460..73292e2c3d5a 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -6515,7 +6515,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { KeyChain.bindAsUser(mContext, userHandle)) { IKeyChainService keyChain = keyChainConnection.getService(); return keyChain.setGrant(granteeUid, alias, hasGrant); - } catch (RemoteException e) { + } catch (RemoteException | AssertionError e) { Slogf.e(LOG_TAG, "Setting grant for package.", e); return false; } |