Merge "Cached list of pre-created users on UserManagerService." into rvc-qpr-dev (e54b76c0) · Commits · e / os / android_frameworks_base

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

+60 −10

Original line number	Original line	Diff line number	Diff line
	@@ -114,7 +114,6 @@ import com.android.server.SystemService;
	import com.android.server.am.UserState;		import com.android.server.am.UserState;
	import com.android.server.storage.DeviceStorageMonitorInternal;		import com.android.server.storage.DeviceStorageMonitorInternal;
	import com.android.server.utils.TimingsTraceAndSlog;		import com.android.server.utils.TimingsTraceAndSlog;
	import com.android.server.wm.ActivityTaskManagerInternal;

	import libcore.io.IoUtils;		import libcore.io.IoUtils;

	@@ -134,6 +133,7 @@ import java.io.OutputStream;
	import java.io.PrintWriter;		import java.io.PrintWriter;
	import java.nio.charset.StandardCharsets;		import java.nio.charset.StandardCharsets;
	import java.util.ArrayList;		import java.util.ArrayList;
			import java.util.Arrays;
	import java.util.Collections;		import java.util.Collections;
	import java.util.LinkedList;		import java.util.LinkedList;
	import java.util.List;		import java.util.List;
	@@ -406,6 +406,10 @@ public class UserManagerService extends IUserManager.Stub {

	@GuardedBy("mUsersLock")		@GuardedBy("mUsersLock")
	private int[] mUserIds;		private int[] mUserIds;

			@GuardedBy("mUsersLock")
			private int[] mUserIdsIncludingPreCreated;

	@GuardedBy("mPackagesLock")		@GuardedBy("mPackagesLock")
	private int mNextSerialNumber;		private int mNextSerialNumber;
	private int mUserVersion = 0;		private int mUserVersion = 0;
	@@ -2480,16 +2484,35 @@ public class UserManagerService extends IUserManager.Stub {
	}		}

	/**		/**
	* Returns an array of user ids. This array is cached here for quick access, so do not modify or		* Returns an array of user ids.
	* cache it elsewhere.		*
			* <p>This array is cached here for quick access, so do not modify or cache it elsewhere.
			*
	* @return the array of user ids.		* @return the array of user ids.
	*/		*/
	public int[] getUserIds() {		public @NonNull int[] getUserIds() {
	synchronized (mUsersLock) {		synchronized (mUsersLock) {
	return mUserIds;		return mUserIds;
	}		}
	}		}

			/**
			* Returns an array of user ids, including pre-created users.
			*
			* <p>This method should only used for the specific cases that need to handle pre-created users;
			* most callers should call {@link #getUserIds()} instead.
			*
			* <p>This array is cached here for quick access, so do not modify or
			* cache it elsewhere.
			*
			* @return the array of user ids.
			*/
			public @NonNull int[] getUserIdsIncludingPreCreated() {
			synchronized (mUsersLock) {
			return mUserIdsIncludingPreCreated;
			}
			}

	@GuardedBy({"mRestrictionsLock", "mPackagesLock"})		@GuardedBy({"mRestrictionsLock", "mPackagesLock"})
	private void readUserListLP() {		private void readUserListLP() {
	if (!mUserListFile.exists()) {		if (!mUserListFile.exists()) {
	@@ -4327,23 +4350,43 @@ public class UserManagerService extends IUserManager.Stub {
	*/		*/
	private void updateUserIds() {		private void updateUserIds() {
	int num = 0;		int num = 0;
			int numIncludingPreCreated = 0;
	synchronized (mUsersLock) {		synchronized (mUsersLock) {
	final int userSize = mUsers.size();		final int userSize = mUsers.size();
	for (int i = 0; i < userSize; i++) {		for (int i = 0; i < userSize; i++) {
	UserInfo userInfo = mUsers.valueAt(i).info;		final UserInfo userInfo = mUsers.valueAt(i).info;
	if (!userInfo.partial && !userInfo.preCreated) {		if (!userInfo.partial) {
			numIncludingPreCreated++;
			if (!userInfo.preCreated) {
	num++;		num++;
	}		}
	}		}
			}
			if (DBG) {
			Slog.d(LOG_TAG, "updateUserIds(): numberUsers= " + num
			+ " includingPreCreated=" + numIncludingPreCreated);
			}
	final int[] newUsers = new int[num];		final int[] newUsers = new int[num];
			final int[] newUsersIncludingPreCreated = new int[numIncludingPreCreated];

	int n = 0;		int n = 0;
			int nIncludingPreCreated = 0;
	for (int i = 0; i < userSize; i++) {		for (int i = 0; i < userSize; i++) {
	UserInfo userInfo = mUsers.valueAt(i).info;		final UserInfo userInfo = mUsers.valueAt(i).info;
	if (!userInfo.partial && !userInfo.preCreated) {		if (!userInfo.partial) {
	newUsers[n++] = mUsers.keyAt(i);		final int userId = mUsers.keyAt(i);
			newUsersIncludingPreCreated[nIncludingPreCreated++] = userId;
			if (!userInfo.preCreated) {
			newUsers[n++] = userId;
			}
	}		}
	}		}
	mUserIds = newUsers;		mUserIds = newUsers;
			mUserIdsIncludingPreCreated = newUsersIncludingPreCreated;
			if (DBG) {
			Slog.d(LOG_TAG, "updateUserIds(): userIds= " + Arrays.toString(mUserIds)
			+ " includingPreCreated=" + Arrays.toString(mUserIdsIncludingPreCreated));
			}
	}		}
	}		}

	@@ -4791,6 +4834,13 @@ public class UserManagerService extends IUserManager.Stub {
	synchronized (mUserStates) {		synchronized (mUserStates) {
	pw.println(" Started users state: " + mUserStates);		pw.println(" Started users state: " + mUserStates);
	}		}
			synchronized (mUsersLock) {
			pw.print(" Cached user IDs: ");
			pw.println(Arrays.toString(mUserIds));
			pw.print(" Cached user IDs (including pre-created): ");
			pw.println(Arrays.toString(mUserIdsIncludingPreCreated));
			}

	} // synchronized (mPackagesLock)		} // synchronized (mPackagesLock)

	// Dump some capabilities		// Dump some capabilities

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+1 −13

Original line number	Original line	Diff line number	Diff line
	@@ -83,7 +83,6 @@ import android.content.pm.PackageParser;
	import android.content.pm.ParceledListSlice;		import android.content.pm.ParceledListSlice;
	import android.content.pm.PermissionGroupInfo;		import android.content.pm.PermissionGroupInfo;
	import android.content.pm.PermissionInfo;		import android.content.pm.PermissionInfo;
	import android.content.pm.UserInfo;
	import android.content.pm.parsing.component.ParsedPermission;		import android.content.pm.parsing.component.ParsedPermission;
	import android.content.pm.parsing.component.ParsedPermissionGroup;		import android.content.pm.parsing.component.ParsedPermissionGroup;
	import android.content.pm.permission.SplitPermissionInfoParcelable;		import android.content.pm.permission.SplitPermissionInfoParcelable;
	@@ -121,7 +120,6 @@ import android.util.Log;
	import android.util.Slog;		import android.util.Slog;
	import android.util.SparseArray;		import android.util.SparseArray;
	import android.util.SparseBooleanArray;		import android.util.SparseBooleanArray;
	import android.util.TimingsTraceLog;

	import com.android.internal.annotations.GuardedBy;		import com.android.internal.annotations.GuardedBy;
	import com.android.internal.annotations.VisibleForTesting;		import com.android.internal.annotations.VisibleForTesting;
	@@ -3078,17 +3076,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	* @return user ids for created users and pre-created users		* @return user ids for created users and pre-created users
	*/		*/
	private int[] getAllUserIds() {		private int[] getAllUserIds() {
	final TimingsTraceLog t = new TimingsTraceLog(TAG, Trace.TRACE_TAG_SYSTEM_SERVER);		return UserManagerService.getInstance().getUserIdsIncludingPreCreated();
	t.traceBegin("getAllUserIds");
	List<UserInfo> users = UserManagerService.getInstance().getUsers(
	/excludePartial=/ true, /excludeDying=/ true, /excludePreCreated=/ false);
	int size = users.size();
	final int[] userIds = new int[size];
	for (int i = 0; i < size; i++) {
	userIds[i] = users.get(i).id;
	}
	t.traceEnd();
	return userIds;
	}		}

	/**		/**