summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ayush Sharma <ayushsha@google.com> 2023-10-10 17:19:44 +0000
committer Ayush Sharma <ayushsha@google.com> 2023-10-10 17:19:44 +0000
commita93b4fdfbe4494ae32c76d4e8c1deae1718d7a0a (patch)
treeeeea030eef98a6a1e005fe72238befe28210804f
parentdc4d27df64e6316396aa9a2da84b90fef2056ac9 (diff)
Handle error connecting to KeychainService
Bug: 210537972 Test: NA Change-Id: If2f41aea48ac9284ad205debb878d633072431f4
-rw-r--r--services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java2
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 50dc061c1ab2..d30b5359fa1e 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -6471,7 +6471,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;
}