Merge "Flag removal: CacheProfileIdsReadOnly" into main (a22bc30f) · Commits · e / os / android_frameworks_base

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

+0 −11

Original line number	Diff line number	Diff line
		@@ -166,17 +166,6 @@ flag {
		is_fixed_read_only: true
		}

		flag {
		name: "cache_profile_ids_read_only"
		namespace: "multiuser"
		description: "Cache getProfileIds to avoid unnecessary binder calls"
		bug: "350421409"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		is_fixed_read_only: true
		}

		flag {
		name: "cache_profile_type_read_only"
		namespace: "multiuser"

core/java/android/os/UserManager.java

+5 −23

Original line number	Diff line number	Diff line
		@@ -5652,15 +5652,7 @@ public class UserManager {
		Manifest.permission.CREATE_USERS,
		Manifest.permission.QUERY_USERS}, conditional = true)
		public @NonNull int[] getProfileIds(@UserIdInt int userId, boolean enabledOnly) {
		if (android.multiuser.Flags.cacheProfileIdsReadOnly()) {
		return enabledOnly ? getEnabledProfileIds(userId) : getProfileIdsWithDisabled(userId);
		} else {
		try {
		return mService.getProfileIds(userId, enabledOnly);
		} catch (RemoteException re) {
		throw re.rethrowFromSystemServer();
		}
		}
		}

		/**
		@@ -5674,12 +5666,8 @@ public class UserManager {
		Manifest.permission.QUERY_USERS}, conditional = true)
		@CachedProperty(api = "user_manager_users")
		public int[] getProfileIdsWithDisabled(@UserIdInt int userId) {
		if (android.multiuser.Flags.cacheProfileIdsReadOnly()) {
		return UserManagerCache.getProfileIdsWithDisabled(
		(Integer userIdentifuer) -> mService.getProfileIds(userIdentifuer, false), userId);
		} else {
		return getProfileIds(userId, false /* enabledOnly */);
		}
		(Integer userIdentifier) -> mService.getProfileIds(userIdentifier, false), userId);
		}

		/**
		@@ -5692,20 +5680,14 @@ public class UserManager {
		Manifest.permission.QUERY_USERS}, conditional = true)
		@CachedProperty(api = "user_manager_users_enabled")
		public int[] getEnabledProfileIds(@UserIdInt int userId) {
		if (android.multiuser.Flags.cacheProfileIdsReadOnly()) {
		return UserManagerCache.getEnabledProfileIds(
		(Integer userIdentifuer) -> mService.getProfileIds(userIdentifuer, true), userId);
		} else {
		return getProfileIds(userId, true /* enabledOnly */);
		}
		(Integer userIdentifier) -> mService.getProfileIds(userIdentifier, true), userId);
		}

		/** @hide */
		public static final void invalidateEnabledProfileIds() {
		if (android.multiuser.Flags.cacheProfileIdsReadOnly()) {
		UserManagerCache.invalidateEnabledProfileIds();
		}
		}

		/**
		* @return A list of ids of profiles associated with the specified user excluding those with