Merge "Flag removal: CacheProfileParentReadOnly" into main (9d554602) · Commits · e / os / android_frameworks_base

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

+0 −12

Original line number	Diff line number	Diff line
		@@ -211,18 +211,6 @@ flag {
		is_fixed_read_only: true
		}


		flag {
		name: "cache_profile_parent_read_only"
		namespace: "multiuser"
		description: "Cache getProfileParent to avoid unnecessary binder calls"
		bug: "350417399"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		is_fixed_read_only: true
		}

		flag {
		name: "cache_profile_ids_read_only"
		namespace: "multiuser"

+14 −24

Original line number	Diff line number	Diff line
		@@ -5777,7 +5777,6 @@ public class UserManager {
		})
		@CachedProperty(api = "user_manager_users")
		public @Nullable UserHandle getProfileParent(@NonNull UserHandle user) {
		if (android.multiuser.Flags.cacheProfileParentReadOnly()) {
		final UserHandle userHandle = UserManagerCache.getProfileParent(
		(UserHandle query) -> {
		UserInfo info = getProfileParent(query.getIdentifier());
		@@ -5792,13 +5791,6 @@ public class UserManager {
		return null;
		}
		return userHandle;
		} else {
		UserInfo info = getProfileParent(user.getIdentifier());
		if (info == null) {
		return null;
		}
		return UserHandle.of(info.id);
		}
		}

		/**
		@@ -6606,9 +6598,7 @@ public class UserManager {
		*/
		public static final void invalidateCacheOnUserListChange() {
		UserManagerCache.invalidateUserSerialNumber();
		if (android.multiuser.Flags.cacheProfileParentReadOnly()) {
		UserManagerCache.invalidateProfileParent();
		}
		invalidateCacheOnUserDataChanged();
		invalidateEnabledProfileIds();
		invalidateUserRestriction();