diff options
| -rw-r--r-- | core/java/android/os/UserManager.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 507bcb8c2717..08f68f1874e7 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -4206,12 +4206,16 @@ 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() { - UserManagerCache.invalidateUserRestrictionFromQuery(); + if (android.multiuser.Flags.cacheUserRestrictionsReadOnly()) { + UserManagerCache.invalidateUserRestrictionFromQuery(); + } } /** |