Merge "Extract ActiveAdmin and DevicePolicyData from DPMS." (7f92bc29) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/UserRestrictionsUtils.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -139,6 +139,11 @@ public class UserRestrictionsUtils {
		UserManager.DISALLOW_CONFIG_PRIVATE_DNS
		});

		public static final Set<String> DEPRECATED_USER_RESTRICTIONS = Sets.newArraySet(
		UserManager.DISALLOW_ADD_MANAGED_PROFILE,
		UserManager.DISALLOW_REMOVE_MANAGED_PROFILE
		);

		/**
		* Set of user restriction which we don't want to persist.
		*/

services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java

0 → 100644

+1116 −0

File added.

Preview size limit exceeded, changes collapsed.

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyData.java

0 → 100644

+566 −0

File added.

Preview size limit exceeded, changes collapsed.

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+18 −1595

File changed.

Preview size limit exceeded, changes collapsed.

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

+6 −8

Original line number	Diff line number	Diff line
		@@ -1604,7 +1604,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {
		dpm.setApplicationRestrictionsManagingPackage(admin1, RESTRICTIONS_DELEGATE);

		// DPMS correctly stores and retrieves the delegates
		DevicePolicyManagerService.DevicePolicyData policy = dpms.mUserData.get(userHandle);
		DevicePolicyData policy = dpms.mUserData.get(userHandle);
		assertEquals(2, policy.mDelegationMap.size());
		MoreAsserts.assertContentsInAnyOrder(policy.mDelegationMap.get(CERT_DELEGATE),
		DELEGATION_CERT_INSTALL);
		@@ -1846,11 +1846,11 @@ public class DevicePolicyManagerTest extends DpmTestBase {
		reset(getServices().userManagerInternal);
		}

		private DevicePolicyManagerService.ActiveAdmin getDeviceOwner() {
		private ActiveAdmin getDeviceOwner() {
		ComponentName component = dpms.mOwners.getDeviceOwnerComponent();
		DevicePolicyManagerService.DevicePolicyData policy =
		DevicePolicyData policy =
		dpms.getUserData(dpms.mOwners.getDeviceOwnerUserId());
		for (DevicePolicyManagerService.ActiveAdmin admin : policy.mAdminList) {
		for (ActiveAdmin admin : policy.mAdminList) {
		if (component.equals(admin.info.getComponent())) {
		return admin;
		}
		@@ -3745,8 +3745,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {
		setUserSetupCompleteForUser(false, userId);

		// GIVEN userComplete is true in DPM
		DevicePolicyManagerService.DevicePolicyData userData =
		new DevicePolicyManagerService.DevicePolicyData(userId);
		DevicePolicyData userData = new DevicePolicyData(userId);
		userData.mUserSetupComplete = true;
		dpms.mUserData.put(UserHandle.USER_SYSTEM, userData);

		@@ -3770,8 +3769,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {
		setUserSetupCompleteForUser(false, userId);

		// GIVEN userComplete is true in DPM
		DevicePolicyManagerService.DevicePolicyData userData =
		new DevicePolicyManagerService.DevicePolicyData(userId);
		DevicePolicyData userData = new DevicePolicyData(userId);
		userData.mUserSetupComplete = true;
		dpms.mUserData.put(UserHandle.USER_SYSTEM, userData);