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

Remove unnecessary locking that causes deadlock.

Browse Source 
This was moved from PackageManagerService but we forgot to remove the
unnecessary synchronization on mLock, which will result in calling
into package manager with the permission lock held.

Fixes: 177178190
Test: presubmit
Change-Id: I5b4a6a337e94e8483067cac5143e45d08b2eb983
This commit is contained in:
Hai Zhang
2021-01-11 09:54:31 -08:00
parent bb45c563c4
commit ad65ba4dc9
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4463,12 +4463,10 @@ public class PermissionManagerService extends IPermissionManager.Stub {
final PermissionPolicyInternal permissionPolicyInternal = LocalServices.getService(
PermissionPolicyInternal.class);
permissionPolicyInternal.setOnInitializedCallback(userId -> {
// The SDK updated case is already handled when we run during the ctor.
synchronized (mLock) {
updateAllPermissions(StorageManager.UUID_PRIVATE_INTERNAL, false);
}
});
permissionPolicyInternal.setOnInitializedCallback(userId ->
// The SDK updated case is already handled when we run during the ctor.
updateAllPermissions(StorageManager.UUID_PRIVATE_INTERNAL, false)
);
mSystemReady = true;