Merge "Flag removal: CacheQuietModeState" into main (0c90f98d) · Commits · e / os / android_frameworks_base

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

+0 −10

Original line number	Diff line number	Diff line
		@@ -256,16 +256,6 @@ flag {
		is_fixed_read_only: true
		}

		flag {
		name: "cache_quiet_mode_state"
		namespace: "multiuser"
		description: "Optimise quiet mode state retrieval"
		bug: "350420769"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "cache_user_properties_correctly_read_only"
		namespace: "multiuser"

+5 −12

Original line number	Diff line number	Diff line
		@@ -5901,7 +5901,6 @@ public class UserManager {
		*/
		@CachedProperty(mods = {})
		public boolean isQuietModeEnabled(UserHandle userHandle) {
		if (android.multiuser.Flags.cacheQuietModeState()) {
		final int userId = userHandle.getIdentifier();
		if (userId < 0) {
		return false;
		@@ -5909,12 +5908,6 @@ public class UserManager {
		return ((UserManagerCache) mIpcDataCache).isQuietModeEnabled(
		(UserHandle uh) -> mService.isQuietModeEnabled(uh.getIdentifier()), userHandle);
		}
		try {
		return mService.isQuietModeEnabled(userHandle.getIdentifier());
		} catch (RemoteException re) {
		throw re.rethrowFromSystemServer();
		}
		}

		/**
		* Returns whether the given user has a badge (generally to put on profiles' icons).