Merge "Flag removal: cacheUserSerialNumber & cacheUserSerialNumberReadOnly" into main (b8e96d2f) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/multiuser.aconfig

+0 −21

Original line number	Diff line number	Diff line
		@@ -235,27 +235,6 @@ flag {
		is_fixed_read_only: true
		}

		flag {
		name: "cache_user_serial_number"
		namespace: "multiuser"
		description: "Optimise user serial number retrieval"
		bug: "340018451"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "cache_user_serial_number_read_only"
		namespace: "multiuser"
		description: "Optimise user serial number retrieval. Read only flag, so that it can be used before the flags are initialized."
		bug: "353134536"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		is_fixed_read_only: true
		}

		flag {
		name: "cache_user_info_read_only"
		namespace: "multiuser"

+6 −17

Original line number	Diff line number	Diff line
		@@ -6646,11 +6646,6 @@ public class UserManager {
		@UnsupportedAppUsage
		@CachedProperty(mods = {}, api = "user_manager_users")
		public int getUserSerialNumber(@UserIdInt int userId) {
		// Read only flag should is to fix early access to this API
		// cacheUserSerialNumber to be removed after the
		// cacheUserSerialNumberReadOnly is fully rolled out
		if (android.multiuser.Flags.cacheUserSerialNumberReadOnly()
		\|\| android.multiuser.Flags.cacheUserSerialNumber()) {
		// System user serial number is always 0, and it always exists.
		// There is no need to call binder for that.
		if (userId == UserHandle.USER_SYSTEM) {
		@@ -6659,12 +6654,6 @@ public class UserManager {
		return ((UserManagerCache) mIpcDataCache).getUserSerialNumber(
		mService::getUserSerialNumber, userId);
		}
		try {
		return mService.getUserSerialNumber(userId);
		} catch (RemoteException re) {
		throw re.rethrowFromSystemServer();
		}
		}

		/**
		* Returns a userId on this device for a given user serial number. User handles can be