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

Commit d27e42ab authored by Anna Bauza's avatar Anna Bauza
Browse files

Fix: Add missing flag for caching User Restrictions. 


Bug: 384939656
Change-Id: Ife64807c3a88fd2c8cf2e66fb2d5279c364f2dcb
Test: atest com.android.server.pm.UserManagerCacheTest
Flag: android.multiuser.cache_user_restrictions_read_only
parent 52df8a06

core/java/android/os/UserManager.java

+5 −1
Original line number Diff line number Diff line
@@ -4206,13 +4206,17 @@ public class UserManager { 
    private boolean getUserRestrictionFromQuery(@NonNull Pair<String, Integer> restrictionPerUser) {

        return UserManagerCache.getUserRestrictionFromQuery(

                (Pair<String, Integer> q) -> mService.hasUserRestriction(q.first, q.second),

                // bypass cache if the flag is disabled

                (Pair<String, Integer> q) -> !android.multiuser.Flags.cacheUserRestrictionsReadOnly(),

                restrictionPerUser);

    }



    /** @hide */

    public static final void invalidateUserRestriction() {

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

            UserManagerCache.invalidateUserRestrictionFromQuery();

        }

    }



    /**

     * @hide