Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8bbbcd3d: Merge "Policy: make bulk CA uninstalls happen in service" into mnc-dev

Browse Source 
* commit '8bbbcd3d5402285b05db64c3ffd3a959f26ad16c':
  Policy: make bulk CA uninstalls happen in service
This commit is contained in:
Robin Lee
2015-06-10 19:55:00 +00:00
committed by Android Git Automerger
parent f568af1bb1 8bbbcd3d54
commit 347836e965
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -2275,7 +2275,7 @@ public class DevicePolicyManager {
if (mService != null) {
try {
final String alias = getCaCertAlias(certBuffer);
mService.uninstallCaCert(admin, alias);
mService.uninstallCaCerts(admin, new String[] {alias});
} catch (CertificateException e) {
Log.w(TAG, "Unable to parse certificate", e);
} catch (RemoteException e) {
@@ -2322,12 +2322,11 @@ public class DevicePolicyManager {
*/
public void uninstallAllUserCaCerts(@Nullable ComponentName admin) {
if (mService != null) {
for (String alias : new TrustedCertificateStore().userAliases()) {
try {
mService.uninstallCaCert(admin, alias);
} catch (RemoteException re) {
Log.w(TAG, "Failed talking with device policy service", re);
}
try {
mService.uninstallCaCerts(admin, new TrustedCertificateStore().userAliases()
.toArray(new String[0]));
} catch (RemoteException re) {
Log.w(TAG, "Failed talking with device policy service", re);
}
}
}

2
core/java/android/app/admin/IDevicePolicyManager.aidl
View File

@@ -128,7 +128,7 @@ interface IDevicePolicyManager {
boolean hasUserSetupCompleted();
boolean installCaCert(in ComponentName admin, in byte[] certBuffer);
void uninstallCaCert(in ComponentName admin, in String alias);
void uninstallCaCerts(in ComponentName admin, in String[] aliases);
void enforceCanManageCaCerts(in ComponentName admin);
boolean installKeyPair(in ComponentName who, in byte[] privKeyBuffer, in byte[] certBuffer, String alias);

6
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -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 {