Merge "Minor improvements on user management stack." (0b9afd91) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManagerInternal.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -389,6 +389,10 @@ public abstract class ActivityManagerInternal {
		*/
		public abstract boolean isAppStartModeDisabled(int uid, String packageName);

		/**
		* Returns the ids of the current user and all of its profiles (if any), regardless of the
		* running state of the profiles.
		*/
		public abstract int[] getCurrentProfileIds();
		public abstract UserInfo getCurrentUser();
		public abstract void ensureNotSpecialUser(@UserIdInt int userId);

core/proto/android/server/activitymanagerservice.proto

+5 −0

Original line number	Diff line number	Diff line
		@@ -978,6 +978,11 @@ message UserControllerProto {
		}
		repeated UserProfile user_profile_group_ids = 4;
		repeated int32 visible_users_array = 5;

		// current_user contains the id of the current user, while current_profiles contains the ids of
		// both the current user and its profiles (if any)
		optional int32 current_user = 6;
		repeated int32 current_profiles = 7;
		}

		// sync with com.android.server.am.AppTimeTracker.java

services/core/java/com/android/server/am/ActivityManagerService.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -16771,7 +16771,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		mAtmInternal.onUserStopped(userId);
		// Clean up various services by removing the user
		mBatteryStatsService.onUserRemoved(userId);
		mUserController.onUserRemoved(userId);
		}

		@Override

services/core/java/com/android/server/am/UserController.java

+45 −10

Original line number	Diff line number	Diff line
		@@ -120,6 +120,7 @@ import com.android.server.SystemService.UserCompletedEventType;
		import com.android.server.SystemServiceManager;
		import com.android.server.am.UserState.KeyEvictedCallback;
		import com.android.server.pm.UserManagerInternal;
		import com.android.server.pm.UserManagerInternal.UserLifecycleListener;
		import com.android.server.pm.UserManagerService;
		import com.android.server.utils.Slogf;
		import com.android.server.utils.TimingsTraceAndSlog;
		@@ -320,8 +321,12 @@ class UserController implements Handler.Callback {
		@GuardedBy("mLock")
		private int[] mStartedUserArray = new int[] { 0 };

		// If there are multiple profiles for the current user, their ids are here
		// Currently only the primary user can have managed profiles
		/**
		* Contains the current user and its profiles (if any).
		*
		* <p><b>NOTE: </b>it lists all profiles, regardless of their running state (i.e., they're in
		* this list even if not running).
		*/
		@GuardedBy("mLock")
		private int[] mCurrentProfileIds = new int[] {};

		@@ -436,6 +441,18 @@ class UserController implements Handler.Callback {
		@GuardedBy("mLock")
		private final SparseBooleanArray mVisibleUsers = new SparseBooleanArray();

		private final UserLifecycleListener mUserLifecycleListener = new UserLifecycleListener() {
		@Override
		public void onUserCreated(UserInfo user, Object token) {
		onUserAdded(user);
		}

		@Override
		public void onUserRemoved(UserInfo user) {
		UserController.this.onUserRemoved(user.id);
		}
		};

		UserController(ActivityManagerService service) {
		this(new Injector(service));
		}
		@@ -1667,7 +1684,7 @@ class UserController implements Handler.Callback {
		userSwitchUiEnabled = mUserSwitchUiEnabled;
		}
		mInjector.updateUserConfiguration();
		updateCurrentProfileIds();
		updateProfileRelatedCaches();
		mInjector.getWindowManager().setCurrentUser(userId);
		mInjector.reportCurWakefulnessUsageEvent();
		// Once the internal notion of the active user has switched, we lock the device
		@@ -1681,7 +1698,7 @@ class UserController implements Handler.Callback {
		}
		} else {
		final Integer currentUserIdInt = mCurrentUserId;
		updateCurrentProfileIds();
		updateProfileRelatedCaches();
		synchronized (mLock) {
		mUserLru.remove(currentUserIdInt);
		mUserLru.add(currentUserIdInt);
		@@ -2526,7 +2543,8 @@ class UserController implements Handler.Callback {
		Slogf.d(TAG, "onSystemReady()");

		}
		updateCurrentProfileIds();
		mInjector.getUserManagerInternal().addUserLifecycleListener(mUserLifecycleListener);
		updateProfileRelatedCaches();
		mInjector.reportCurWakefulnessUsageEvent();
		}

		@@ -2551,13 +2569,13 @@ class UserController implements Handler.Callback {
		}

		/**
		* Refreshes the list of users related to the current user when either a
		* user switch happens or when a new related user is started in the
		* background.
		* Refreshes the internal caches related to user profiles.
		*
		* <p>It's called every time a user is started.
		*/
		private void updateCurrentProfileIds() {
		private void updateProfileRelatedCaches() {
		final List<UserInfo> profiles = mInjector.getUserManager().getProfiles(getCurrentUserId(),
		false /* enabledOnly */);
		/* enabledOnly= */ false);
		int[] currentProfileIds = new int[profiles.size()]; // profiles will not be null
		for (int i = 0; i < currentProfileIds.length; i++) {
		currentProfileIds[i] = profiles.get(i).id;
		@@ -2824,6 +2842,18 @@ class UserController implements Handler.Callback {
		}
		}

		private void onUserAdded(UserInfo user) {
		if (!user.isProfile()) {
		return;
		}
		synchronized (mLock) {
		if (user.profileGroupId == mCurrentUserId) {
		mCurrentProfileIds = ArrayUtils.appendInt(mCurrentProfileIds, user.id);
		}
		mUserProfileGroupIds.put(user.id, user.profileGroupId);
		}
		}

		void onUserRemoved(@UserIdInt int userId) {
		synchronized (mLock) {
		int size = mUserProfileGroupIds.size();
		@@ -2938,6 +2968,10 @@ class UserController implements Handler.Callback {
		for (int i = 0; i < mVisibleUsers.size(); i++) {
		proto.write(UserControllerProto.VISIBLE_USERS_ARRAY, mVisibleUsers.keyAt(i));
		}
		proto.write(UserControllerProto.CURRENT_USER, mCurrentUserId);
		for (int i = 0; i < mCurrentProfileIds.length; i++) {
		proto.write(UserControllerProto.CURRENT_PROFILES, mCurrentProfileIds[i]);
		}
		proto.end(token);
		}
		}
		@@ -2975,6 +3009,7 @@ class UserController implements Handler.Callback {
		pw.println(mUserProfileGroupIds.valueAt(i));
		}
		}
		pw.println(" mCurrentProfileIds:" + Arrays.toString(mCurrentProfileIds));
		pw.println(" mCurrentUserId:" + mCurrentUserId);
		pw.println(" mTargetUserId:" + mTargetUserId);
		pw.println(" mLastActiveUsers:" + mLastActiveUsers);