diff options
| author | Robin Lee <rgl@google.com> | 2015-06-09 16:04:38 -0700 |
|---|---|---|
| committer | Robin Lee <rgl@google.com> | 2015-06-10 19:40:44 +0000 |
| commit | 83881bdbdee14cc9726c89019490a0514686f314 (patch) | |
| tree | e391d1362bc9a6c0a1522d3de64e96e47f4683f7 /services/devicepolicy/java | |
| parent | d2784701acf839b5f1cfa9446eca14217c0704c2 (diff) | |
| download | frameworks_base-83881bdbdee14cc9726c89019490a0514686f314.zip frameworks_base-83881bdbdee14cc9726c89019490a0514686f314.tar.gz frameworks_base-83881bdbdee14cc9726c89019490a0514686f314.tar.bz2 | |
Policy: make bulk CA uninstalls happen in service
Fewer round trips, only one point of contact for bugs to creep in.
Bug: 21650477
Change-Id: I1764faa753bd674ecb0d13149d778d99bd2ff4c4
Diffstat (limited to 'services/devicepolicy/java')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index feb0285..ab1206b 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -3129,7 +3129,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } @Override - public void uninstallCaCert(ComponentName admin, String alias) { + public void uninstallCaCerts(ComponentName admin, String[] aliases) { enforceCanManageCaCerts(admin); final UserHandle userHandle = new UserHandle(UserHandle.getCallingUserId()); @@ -3137,7 +3137,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { try { final KeyChainConnection keyChainConnection = KeyChain.bindAsUser(mContext, userHandle); try { - keyChainConnection.getService().deleteCaCertificate(alias); + for (int i = 0 ; i < aliases.length; i++) { + keyChainConnection.getService().deleteCaCertificate(aliases[i]); + } } catch (RemoteException e) { Log.e(LOG_TAG, "from CaCertUninstaller: ", e); } finally { |