Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 554df538 authored by Anna Bauza's avatar Anna Bauza
Browse files

Flag removal: CacheProfileParentReadOnly 

Bug: 409605418
Flag: EXEMPT removing android.multiuser.cache_profile_parent_read_only
Test: N/A
Change-Id: I9905e1d88033e590fdcaa0931b643db42b8a29b4
parent b323696e

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

+0 −12
Original line number Original line Diff line number Diff line
@@ -231,18 +231,6 @@ flag { 
  is_fixed_read_only: true

  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 {

flag {

    name: "cache_profile_ids_read_only"

    name: "cache_profile_ids_read_only"

    namespace: "multiuser"

    namespace: "multiuser"

core/java/android/os/UserManager.java

+14 −24
Original line number Original line Diff line number Diff line
@@ -5777,7 +5777,6 @@ public class UserManager { 
    })

    })

    @CachedProperty(api = "user_manager_users")

    @CachedProperty(api = "user_manager_users")

    public @Nullable UserHandle getProfileParent(@NonNull UserHandle user) {

    public @Nullable UserHandle getProfileParent(@NonNull UserHandle user) {

        if (android.multiuser.Flags.cacheProfileParentReadOnly()) {

        final UserHandle userHandle = UserManagerCache.getProfileParent(

        final UserHandle userHandle = UserManagerCache.getProfileParent(

                (UserHandle query) -> {

                (UserHandle query) -> {

                    UserInfo info = getProfileParent(query.getIdentifier());

                    UserInfo info = getProfileParent(query.getIdentifier());
@@ -5792,13 +5791,6 @@ public class UserManager { 
            return null;

            return null;

        }

        }

        return userHandle;

        return userHandle;

        } else {

            UserInfo info = getProfileParent(user.getIdentifier());

            if (info == null) {

                return null;

            }

            return UserHandle.of(info.id);

        }

    }

    }





    /**

    /**
@@ -6613,9 +6605,7 @@ public class UserManager { 
     */

     */

    public static final void invalidateCacheOnUserListChange() {

    public static final void invalidateCacheOnUserListChange() {

        UserManagerCache.invalidateUserSerialNumber();

        UserManagerCache.invalidateUserSerialNumber();

        if (android.multiuser.Flags.cacheProfileParentReadOnly()) {

        UserManagerCache.invalidateProfileParent();

        UserManagerCache.invalidateProfileParent();

        }

        invalidateCacheOnUserDataChanged();

        invalidateCacheOnUserDataChanged();

        invalidateEnabledProfileIds();

        invalidateEnabledProfileIds();

        invalidateUserRestriction();

        invalidateUserRestriction();