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

Merge "Remove unnecessary parent restriction check" into rvc-dev am: 37fc495766

Browse Source 
Change-Id: I3b6916289cfeaa72bf9bff1934995dcf35519d1f
This commit is contained in:
Eran Messeri
2020-03-25 09:20:47 +00:00
committed by Automerger Merge Worker
parent 641ccdf67c 37fc495766
commit 4ce733af3b
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13070,26 +13070,25 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
final boolean addingProfileRestricted = mUserManager.hasUserRestriction(
UserManager.DISALLOW_ADD_MANAGED_PROFILE, callingUserHandle);
UserInfo parentUser = mUserManager.getProfileParent(callingUserId);
final boolean addingProfileRestrictedOnParent = (parentUser != null)
&& mUserManager.hasUserRestriction(
UserManager.DISALLOW_ADD_MANAGED_PROFILE,
UserHandle.of(parentUser.id));
if (mUserManager.getUserInfo(callingUserId).isProfile()) {
Slog.i(LOG_TAG,
String.format("Calling user %d is a profile, cannot add another.",
callingUserId));
// The check is called from inside a managed profile. A managed profile cannot
// be provisioned from within another managed profile.
return CODE_CANNOT_ADD_MANAGED_PROFILE;
}
Slog.i(LOG_TAG, String.format(
"When checking for managed profile provisioning: Has device owner? %b, adding"
+ " profile restricted? %b, adding profile restricted on parent? %b",
hasDeviceOwner, addingProfileRestricted, addingProfileRestrictedOnParent));
// If there's a device owner, the restriction on adding a managed profile must be set
// somewhere.
if (hasDeviceOwner && !addingProfileRestricted && !addingProfileRestrictedOnParent) {
// If there's a device owner, the restriction on adding a managed profile must be set.
if (hasDeviceOwner && !addingProfileRestricted) {
Slog.wtf(LOG_TAG, "Has a device owner but no restriction on adding a profile.");
}
// Do not allow adding a managed profile if there's a restriction, either on the current
// user or its parent user.
if (addingProfileRestricted || addingProfileRestrictedOnParent) {
// Do not allow adding a managed profile if there's a restriction.
if (addingProfileRestricted) {
Slog.i(LOG_TAG, String.format(
"Adding a profile is restricted: User %s Has device owner? %b",
callingUserHandle, hasDeviceOwner));
return CODE_CANNOT_ADD_MANAGED_PROFILE;
}
// If there's a restriction on removing the managed profile then we have to take it
@@ -13098,6 +13097,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
!mUserManager.hasUserRestriction(UserManager.DISALLOW_REMOVE_MANAGED_PROFILE,
callingUserHandle);
if (!mUserManager.canAddMoreManagedProfiles(callingUserId, canRemoveProfile)) {
Slog.i(LOG_TAG, String.format(
"Cannot add more profiles: Can remove current? %b", canRemoveProfile));
return CODE_CANNOT_ADD_MANAGED_PROFILE;
}
} finally {

6
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
View File

@@ -3205,6 +3205,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {
when(getServices().userManager.canAddMoreManagedProfiles(UserHandle.USER_SYSTEM, true))
.thenReturn(true);
setUserSetupCompleteForUser(false, UserHandle.USER_SYSTEM);
when(getServices().userManager.getProfileParent(UserHandle.USER_SYSTEM)).thenReturn(null);
mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID;
}
@@ -3246,6 +3247,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {
when(getServices().userManager.canAddMoreManagedProfiles(UserHandle.USER_SYSTEM, true))
.thenReturn(true);
setUserSetupCompleteForUser(true, UserHandle.USER_SYSTEM);
when(getServices().userManager.getProfileParent(UserHandle.USER_SYSTEM)).thenReturn(null);
mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID;
}
@@ -3617,14 +3619,14 @@ public class DevicePolicyManagerTest extends DpmTestBase {
when(getServices().ipackageManager.hasSystemFeature(PackageManager.FEATURE_MANAGED_USERS, 0))
.thenReturn(true);
when(getServices().userManagerForMock.isSplitSystemUser()).thenReturn(true);
when(getServices().userManagerForMock.isSplitSystemUser()).thenReturn(false);
when(getServices().userManager.getProfileParent(DpmMockContext.CALLER_USER_HANDLE))
.thenReturn(new UserInfo(UserHandle.USER_SYSTEM, "user system", 0));
when(getServices().userManager.canAddMoreManagedProfiles(DpmMockContext.CALLER_USER_HANDLE,
true)).thenReturn(true);
setUserSetupCompleteForUser(false, DpmMockContext.CALLER_USER_HANDLE);
mContext.binder.callingUid = DpmMockContext.CALLER_UID;
mContext.binder.callingUid = DpmMockContext.ANOTHER_UID;
}
public void testIsProvisioningAllowed_provisionManagedProfileWithDeviceOwner_primaryUser()