Merge "Cache device owner user id on UserManagerService" into main (9d9115e4) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -630,6 +630,14 @@ public abstract class UserManagerInternal {
		/** Logs an activity launched in the headless system user */
		public abstract void logLaunchedHsuActivity(ComponentName activity);

		/**
		* Sets the id of the {@code DeviceOwner}, if any.
		*
		* <p>{@code DeviceOwner} is a {@code DPM} (Device Policy Management) concept and hence should
		* only be called by the {@code DPM} infra.
		*/
		public abstract void setDeviceOwnerUserId(@CanBeNULL @UserIdInt int userId);

		/**
		* Checks whether to show a notification for sounds (e.g., alarms, timers, etc.) from background
		* users.

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

+33 −16

Original line number	Diff line number	Diff line
		@@ -601,6 +601,17 @@ public class UserManagerService extends IUserManager.Stub {
		@GuardedBy("mUsersLock")
		private int[] mUserIdsIncludingPreCreated;

		/**
		* Caches the id of the {@link android.app.admin.DevicePolicyManager#getDeviceOwner() device
		* owner} (or {@code UserHandle.USER_NULL} when there isn't one).
		*
		* <p>It must be cached because the device owner cannot be removed, and calling
		* {@link #mDevicePolicyManagerInternal} to retrieve it when removing a user would break the
		* lock guard order.
		*/
		@GuardedBy("mUsersLock")
		private @CanBeNULL @UserIdInt int mDeviceOwnerUserId = UserHandle.USER_NULL;

		@GuardedBy("mPackagesLock")
		private int mNextSerialNumber;
		private int mUserVersion = 0;
		@@ -1428,14 +1439,6 @@ public class UserManagerService extends IUserManager.Stub {
		return UserHandle.USER_NULL;
		}

		private @UserIdInt int getDeviceOwnerUserId() {
		DevicePolicyManagerInternal dpmi = getDevicePolicyManagerInternal();
		if (dpmi == null) {
		return UserHandle.USER_NULL;
		}
		return dpmi.getDeviceOwnerUserId();
		}

		@Override
		public void setBootUser(@UserIdInt int userId) {
		checkCreateUsersPermission("Set boot user");
		@@ -7311,7 +7314,7 @@ public class UserManagerService extends IUserManager.Stub {
		if (mRemovingUserIds.get(userId)) {
		return UserManager.REMOVE_RESULT_ALREADY_BEING_REMOVED;
		}
		if (userId == getDeviceOwnerUserId()) {
		if (userId == mDeviceOwnerUserId) {
		return UserManager.REMOVE_RESULT_DEVICE_OWNER;
		}
		if (isNonRemovableLastAdminUserLU(userData.info)) {
		@@ -8224,12 +8227,7 @@ public class UserManagerService extends IUserManager.Stub {
		}

		final int currentUserId = getCurrentUserId();
		pw.print("Current user: ");
		if (currentUserId != UserHandle.USER_NULL) {
		pw.println(currentUserId);
		} else {
		pw.println("N/A");
		}
		printNullableUser(pw, "Current user", currentUserId);

		pw.println();
		synchronized (mPackagesLock) {
		@@ -8336,7 +8334,8 @@ public class UserManagerService extends IUserManager.Stub {
		pw.println(" System user allocations: " + mUser0Allocations.get());
		}
		synchronized (mUsersLock) {
		pw.println(" Boot user: " + mBootUser);
		printNullableUser(pw, "Boot user", mBootUser);
		printNullableUser(pw, "Device owner user", mDeviceOwnerUserId);
		}
		// TODO(b/413464199): This confusing line is, regrettably, currently required by Tradefed.
		pw.println("Can add private profile: "+ canAddPrivateProfile(currentUserId));
		@@ -8378,6 +8377,16 @@ public class UserManagerService extends IUserManager.Stub {

		}

		private static void printNullableUser(PrintWriter pw, String what,
		@CanBeNULL @UserIdInt int userId) {
		pw.print(what); pw.print(": ");
		if (userId == UserHandle.USER_NULL) {
		pw.println("N/A");
		} else {
		pw.println(userId);
		}
		}

		private void dumpUser(PrintWriter pw, @CanBeCURRENT @UserIdInt int userId, StringBuilder sb,
		long now, long nowRealtime) {
		if (userId == UserHandle.USER_CURRENT) {
		@@ -9053,6 +9062,14 @@ public class UserManagerService extends IUserManager.Stub {
		mNonComplianceLogger.logLaunchedHsuActivity(activity);
		}

		@Override
		public void setDeviceOwnerUserId(int userId) {
		Slogf.i(LOG_TAG, "Setting device owner user as %d", userId);
		synchronized (mUsersLock) {
		mDeviceOwnerUserId = userId;
		}
		}

		} // class LocalService

		/**

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -2318,7 +2318,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		injector.getUserManager(),
		injector.getPackageManagerInternal(),
		injector.getActivityTaskManagerInternal(),
		injector.getActivityManagerInternal(), mStateCache, pathProvider);
		injector.getActivityManagerInternal(),
		injector.getUserManagerInternal(),
		mStateCache, pathProvider);
		}

		/**
		@@ -10018,13 +10020,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		UserHandle.of(u));
		}

		// TODO Send to system too?
		sendOwnerChangedBroadcast(DevicePolicyManager.ACTION_DEVICE_OWNER_CHANGED, userId);
		});
		mDeviceAdminServiceController.startServiceForAdmin(
		admin.getPackageName(), userId, "set-device-owner");

		Slogf.i(LOG_TAG, "Device owner set: " + admin + " on user " + userId);
		Slogf.i(LOG_TAG, "Device owner set: %s on user %d", admin, userId);
		}

		if (setProfileOwnerOnCurrentUserIfNecessary
		@@ -10439,7 +10440,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		sendOwnerChangedBroadcast(DevicePolicyManager.ACTION_DEVICE_OWNER_CHANGED,
		deviceOwnerUserId);
		});
		Slogf.i(LOG_TAG, "Device owner removed: " + deviceOwnerComponent);
		Slogf.i(LOG_TAG, "Device owner removed: %s", deviceOwnerComponent);
		}
		}

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,8 @@ import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.server.LocalServices;
		import com.android.server.devicepolicy.OwnersData.OwnerInfo;
		import com.android.server.pm.UserManagerInternal;
		import com.android.server.utils.Slogf;
		import com.android.server.wm.ActivityTaskManagerInternal;

		import java.io.File;
		@@ -66,6 +68,7 @@ class Owners {
		private final PackageManagerInternal mPackageManagerInternal;
		private final ActivityTaskManagerInternal mActivityTaskManagerInternal;
		private final ActivityManagerInternal mActivityManagerInternal;
		private final UserManagerInternal mUserManagerInternal;
		private final DeviceStateCacheImpl mDeviceStateCache;

		@GuardedBy("mData")
		@@ -78,12 +81,14 @@ class Owners {
		PackageManagerInternal packageManagerInternal,
		ActivityTaskManagerInternal activityTaskManagerInternal,
		ActivityManagerInternal activityManagerInternal,
		UserManagerInternal userManagerInternal,
		DeviceStateCacheImpl deviceStateCache,
		PolicyPathProvider pathProvider) {
		mUserManager = userManager;
		mPackageManagerInternal = packageManagerInternal;
		mActivityTaskManagerInternal = activityTaskManagerInternal;
		mActivityManagerInternal = activityManagerInternal;
		mUserManagerInternal = userManagerInternal;
		mDeviceStateCache = deviceStateCache;
		mData = new OwnersData(pathProvider);
		}
		@@ -119,9 +124,11 @@ class Owners {
		// ActivityTaskManager.
		@GuardedBy("mData")
		private void notifyChangeLocked() {
		Slogf.d(TAG, "notifyChangeLocked()");
		pushToDevicePolicyManager();
		pushToPackageManagerLocked();
		pushToActivityManagerLocked();
		pushToUserManagerLocked();
		pushToAppOpsLocked();
		}

		@@ -170,6 +177,11 @@ class Owners {
		mActivityManagerInternal.setProfileOwnerUid(profileOwners);
		}

		@GuardedBy("mData")
		private void pushToUserManagerLocked() {
		mUserManagerInternal.setDeviceOwnerUserId(getDeviceOwnerUserId());
		}

		@GuardedBy("mData")
		int getDeviceOwnerUidLocked() {
		if (mData.mDeviceOwner != null) {
		@@ -731,6 +743,7 @@ class Owners {
		synchronized (mData) {
		mSystemReady = true;
		pushToActivityManagerLocked();
		pushToUserManagerLocked();
		pushToAppOpsLocked();
		}
		}

services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceMockedTest.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -2086,7 +2086,7 @@ public final class UserManagerServiceMockedTest {
		var dyingUser = addDyingUser(new UserInfo(USER_ID4, A_USER_HAS_NO_NAME, FLAG_FULL));
		var deviceOwnerUser = addUser(
		new UserInfo(USER_ID5, A_USER_HAS_NO_NAME, FLAG_FULL \| FLAG_ADMIN));
		mockGetDeviceOwnerUserId(deviceOwnerUser.id);
		mUmi.setDeviceOwnerUserId(deviceOwnerUser.id);

		// Failure cases first
		expectGetUserRemovability("system user", USER_SYSTEM, REMOVE_RESULT_ERROR_SYSTEM_USER);
		@@ -2328,12 +2328,6 @@ public final class UserManagerServiceMockedTest {
		.thenReturn(new Pair<>(currentUserId, targetUserId));
		}

		private void mockGetDeviceOwnerUserId(@UserIdInt int deviceOwnerUserId) {
		Log.d(TAG, "mockGetDeviceOwnerUserId(): " + deviceOwnerUserId);
		mockGetLocalService(DevicePolicyManagerInternal.class, mDevicePolicyManagerInternal);
		when(mDevicePolicyManagerInternal.getDeviceOwnerUserId()).thenReturn(deviceOwnerUserId);
		}

		private <T> void mockGetLocalService(Class<T> serviceClass, T service) {
		doReturn(service).when(() -> LocalServices.getService(serviceClass));
		}