Merge "Flag removal: InvalidateCacheOnUsersChangedReadOnly" into main (3a74c012) · Commits · e / os / android_frameworks_base

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

+0 −11

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

		flag {
		name: "invalidate_cache_on_users_changed_read_only"
		namespace: "multiuser"
		description: "Invalidate the cache when users are added or removed to improve caches."
		bug: "372383485"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		is_fixed_read_only: true
		}

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

+4 −9

Original line number	Diff line number	Diff line
		@@ -5973,9 +5973,8 @@ public class UserManagerService extends IUserManager.Stub {
		}

		userInfo.partial = false;
		if (android.multiuser.Flags.invalidateCacheOnUsersChangedReadOnly()) {
		UserManager.invalidateCacheOnUserListChange();
		}

		synchronized (mPackagesLock) {
		writeUserLP(userData);
		}
		@@ -6572,9 +6571,7 @@ public class UserManagerService extends IUserManager.Stub {
		// on next startup, in case the runtime stops now before stopping and
		// removing the user completely.
		userData.info.partial = true;
		if (android.multiuser.Flags.invalidateCacheOnUsersChangedReadOnly()) {
		UserManager.invalidateCacheOnUserListChange();
		}
		// Mark it as disabled, so that it isn't returned any more when
		// profiles are queried.
		addUserInfoFlags(userData.info, UserInfo.FLAG_DISABLED);
		@@ -7187,9 +7184,7 @@ public class UserManagerService extends IUserManager.Stub {
		*/
		@GuardedBy("mUsersLock")
		private void addUserDataLU(UserData userData) {
		if (android.multiuser.Flags.invalidateCacheOnUsersChangedReadOnly()) {
		UserManager.invalidateCacheOnUserListChange();
		}
		mUsers.put(userData.info.id, userData);
		}