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

Merge "Remove the admin from the removing list when refreshing that admin." into nyc-dev

Browse Source 
am: f4b30e2

* commit 'f4b30e2147671476564c8bba6edf33aa63334f6e':
  Remove the admin from the removing list when refreshing that admin.

Change-Id: Ifd93b6e4d0e495e45fec5388c941675f8edfbf37
This commit is contained in:
Sudheer Shanka
2016-04-05 17:28:30 +00:00
committed by android-build-merger
parent e8235003c2 f4b30e2147
commit 179e913550
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2805,6 +2805,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
&& getActiveAdminUncheckedLocked(adminReceiver, userHandle) != null) {
throw new IllegalArgumentException("Admin is already added");
}
if (policy.mRemovingAdmins.contains(adminReceiver)) {
throw new IllegalArgumentException(
"Trying to set an admin which is being removed");
}
ActiveAdmin newAdmin = new ActiveAdmin(info, /* parent */ false);
policy.mAdminMap.put(adminReceiver, newAdmin);
int replaceIndex = -1;