diff options
| author | Pavel Grafov <pgrafov@google.com> | 2021-04-22 16:13:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-04-22 16:13:34 +0000 |
| commit | f8cd83ff2df2da135b0074c61c238bdc85845795 (patch) | |
| tree | f83893f51956a7f00334ab26d968099c70572f90 | |
| parent | a3c2e8478bd25b45e25f749a2bc0fbd3f839ce28 (diff) | |
| parent | 67f11e65cab3bcccacd059be9635700096716466 (diff) | |
Merge "Make sure DPC knows if revoke fails" into sc-dev
| -rw-r--r-- | keystore/java/android/security/IKeyChainService.aidl | 3 | ||||
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/keystore/java/android/security/IKeyChainService.aidl b/keystore/java/android/security/IKeyChainService.aidl index 091f5795784f..6d3d84c75518 100644 --- a/keystore/java/android/security/IKeyChainService.aidl +++ b/keystore/java/android/security/IKeyChainService.aidl @@ -66,7 +66,8 @@ interface IKeyChainService { boolean isCredentialManagementApp(String packageName); // APIs used by KeyChainActivity - void setGrant(int uid, String alias, boolean value); + // setGrant may fail with value=false when ungrant operation fails in KeyStore. + boolean setGrant(int uid, String alias, boolean value); boolean hasGrant(int uid, String alias); // API used by Wifi diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 4fd6febc89d6..cda01dbae945 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -5662,8 +5662,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { try (KeyChainConnection keyChainConnection = KeyChain.bindAsUser(mContext, userHandle)) { IKeyChainService keyChain = keyChainConnection.getService(); - keyChain.setGrant(granteeUid, alias, hasGrant); - return true; + return keyChain.setGrant(granteeUid, alias, hasGrant); } catch (RemoteException e) { Slogf.e(LOG_TAG, "Setting grant for package.", e); return false; |