Merge "Fix network logging on headless system user" (8e6e692f) · Commits · e / os / android_frameworks_base

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

+23 −19

Original line number	Diff line number	Diff line
		@@ -8742,21 +8742,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		}
		}

		private boolean isDeviceOwnerPackage(String packageName, int userId) {
		synchronized (getLockObject()) {
		return mOwners.hasDeviceOwner()
		&& mOwners.getDeviceOwnerUserId() == userId
		&& mOwners.getDeviceOwnerPackageName().equals(packageName);
		}
		}

		private boolean isProfileOwnerPackage(String packageName, int userId) {
		synchronized (getLockObject()) {
		return mOwners.hasProfileOwner(userId)
		&& mOwners.getProfileOwnerPackage(userId).equals(packageName);
		}
		}

		public boolean isProfileOwner(ComponentName who, int userId) {
		final ComponentName profileOwner = mInjector.binderWithCleanCallingIdentity(() ->
		getProfileOwnerAsUser(userId));
		@@ -9315,7 +9300,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		boolean hasProfileOwner = mOwners.hasProfileOwner(userId);
		if (!hasProfileOwner) {
		int managedUserId = getManagedUserId(userId);
		if (managedUserId == -1 && newState != STATE_USER_UNMANAGED) {
		if (managedUserId < 0 && newState != STATE_USER_UNMANAGED) {
		// No managed device, user or profile, so setting provisioning state makes
		// no sense.
		String error = "Not allowed to change provisioning state unless a "
		@@ -12524,7 +12509,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {

		/**
		* @return the user ID of the managed user that is linked to the current user, if any.
		* Otherwise -1.
		* Otherwise UserHandle.USER_NULL (-10000).
		*/
		public int getManagedUserId(@UserIdInt int callingUserId) {
		if (VERBOSE_LOG) Slogf.v(LOG_TAG, "getManagedUserId: callingUserId=%d", callingUserId);
		@@ -12537,7 +12522,26 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		return ui.id;
		}
		if (VERBOSE_LOG) Slogf.v(LOG_TAG, "Managed user not found.");
		return -1;
		return UserHandle.USER_NULL;
		}

		/**
		* Returns the userId of the managed profile on the device.
		* If none exists, return {@link UserHandle#USER_NULL}.
		*
		* We assume there is only one managed profile across all users
		* on the device, which is true for now (HSUM or not) but could
		* change in future.
		*/
		private @UserIdInt int getManagedUserId() {
		// On HSUM, there is only one main user and only the main user
		// can have a managed profile (for now). On non-HSUM, only user 0
		// can host the managed profile and user 0 is the main user.
		// So in both cases, we could just get the main user and
		// search for the profile user under it.
		UserHandle mainUser = mUserManager.getMainUser();
		if (mainUser == null) return UserHandle.USER_NULL;
		return getManagedUserId(mainUser.getIdentifier());
		}

		@Override
		@@ -16187,7 +16191,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		return mOwners.getDeviceOwnerUserId();
		} else {
		return mInjector.binderWithCleanCallingIdentity(
		() -> getManagedUserId(UserHandle.USER_SYSTEM));
		() -> getManagedUserId());
		}
		}
		}

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -219,8 +219,10 @@ public class MockSystemServices {

		// Add the system user with a fake profile group already set up (this can happen in the real
		// world if a managed profile is added and then removed).
		systemUserDataDir = addUser(UserHandle.USER_SYSTEM, UserInfo.FLAG_PRIMARY,
		systemUserDataDir = addUser(UserHandle.USER_SYSTEM,
		UserInfo.FLAG_PRIMARY \| UserInfo.FLAG_MAIN,
		UserManager.USER_TYPE_FULL_SYSTEM, UserHandle.USER_SYSTEM);
		when(userManager.getMainUser()).thenReturn(UserHandle.SYSTEM);

		// System user is always running.
		setUserRunning(UserHandle.USER_SYSTEM, true);