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

Merge "setProfileEnabled should be no-op when the profile is already enabled"

Browse Source
This commit is contained in:
Tony Mak
2016-06-28 11:11:26 +00:00
committed by Android (Google) Code Review
parent cee6570086 bd4148bbab
commit f574cf568b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6083,7 +6083,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
final int userId = UserHandle.getCallingUserId();
enforceManagedProfile(userId, "enable the profile");
// Check if the profile is already enabled.
UserInfo managedProfile = getUserInfo(userId);
if (managedProfile.isEnabled()) {
Slog.e(LOG_TAG,
"setProfileEnabled is called when the profile is already enabled");
return;
}
long id = mInjector.binderClearCallingIdentity();
try {
mUserManager.setUserEnabled(userId);