Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cache isUserUnlockingOrUnlocked Binder calls" into rvc-dev am: adfe0e9193 am: d47bed436d

Browse Source 
Change-Id: I71ba434b8fa08f995806724900f3d25a887cee9f
This commit is contained in:
Collin Fijalkovich
2020-05-26 18:03:12 +00:00
committed by Automerger Merge Worker
parent f7a7e07713 d47bed436d
commit 2bb58d0aa0
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/os/UserManager.java
View File

@@ -2216,6 +2216,20 @@ public class UserManager {
}
};
// Uses IS_USER_UNLOCKED_PROPERTY for invalidation as the APIs have the same dependencies.
private final PropertyInvalidatedCache<Integer, Boolean> mIsUserUnlockingOrUnlockedCache =
new PropertyInvalidatedCache<Integer, Boolean>(
32, CACHE_KEY_IS_USER_UNLOCKED_PROPERTY) {
@Override
protected Boolean recompute(Integer query) {
try {
return mService.isUserUnlockingOrUnlocked(query);
} catch (RemoteException re) {
throw re.rethrowFromSystemServer();
}
}
};
/** {@hide} */
@UnsupportedAppUsage
@RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS,
@@ -2227,6 +2241,7 @@ public class UserManager {
/** {@hide} */
public void disableIsUserUnlockedCache() {
mIsUserUnlockedCache.disableLocal();
mIsUserUnlockingOrUnlockedCache.disableLocal();
}
/** {@hide} */
@@ -2263,11 +2278,7 @@ public class UserManager {
@RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS,
Manifest.permission.INTERACT_ACROSS_USERS}, conditional = true)
public boolean isUserUnlockingOrUnlocked(@UserIdInt int userId) {
try {
return mService.isUserUnlockingOrUnlocked(userId);
} catch (RemoteException re) {
throw re.rethrowFromSystemServer();
}
return mIsUserUnlockingOrUnlockedCache.query(userId);
}
/**