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

Merge "Fix deadlock in getOneTimePermissionUserManager()."

Browse Source
This commit is contained in:
Hai Zhang
2020-11-16 20:13:11 +00:00
committed by Android (Google) Code Review
parent 3e5f65ddcb cd9f253cc4
commit 9100da9aba
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
View File

@@ -3372,16 +3372,28 @@ public class PermissionManagerService extends IPermissionManager.Stub {
SystemConfig.getInstance().getSplitPermissions());
}
@NonNull
private OneTimePermissionUserManager getOneTimePermissionUserManager(@UserIdInt int userId) {
OneTimePermissionUserManager oneTimePermissionUserManager;
synchronized (mLock) {
oneTimePermissionUserManager =
mOneTimePermissionUserManagers.get(userId);
oneTimePermissionUserManager = mOneTimePermissionUserManagers.get(userId);
if (oneTimePermissionUserManager != null) {
return oneTimePermissionUserManager;
}
oneTimePermissionUserManager = new OneTimePermissionUserManager(
mContext.createContextAsUser(UserHandle.of(userId), /*flags*/ 0));
}
// We cannot create a new instance of OneTimePermissionUserManager while holding our own
// lock, which may lead to a deadlock with the package manager lock. So we do it in a
// retry-like way, and just discard the newly created instance if someone else managed to be
// a little bit faster than us when we dropped our own lock.
final OneTimePermissionUserManager newOneTimePermissionUserManager =
new OneTimePermissionUserManager(mContext.createContextAsUser(UserHandle.of(userId),
/*flags*/ 0));
synchronized (mLock) {
oneTimePermissionUserManager = mOneTimePermissionUserManagers.get(userId);
if (oneTimePermissionUserManager != null) {
return oneTimePermissionUserManager;
}
oneTimePermissionUserManager = newOneTimePermissionUserManager;
mOneTimePermissionUserManagers.put(userId, oneTimePermissionUserManager);
}
oneTimePermissionUserManager.registerUninstallListener();