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

Merge "Correct locking in PackageManagerService" into sc-dev

Browse Source
This commit is contained in:
Lee Shombert
2021-08-05 03:17:32 +00:00
committed by Android (Google) Code Review
parent c0a3b39617 1379438362
commit 1a32fc6b5a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -26493,7 +26493,7 @@ public class PackageManagerService extends IPackageManager.Stub
} }
boolean readPermissionStateForUser(@UserIdInt int userId) { boolean readPermissionStateForUser(@UserIdInt int userId) {
synchronized (mPackages) { synchronized (mLock) {
mPermissionManager.writeLegacyPermissionStateTEMP(); mPermissionManager.writeLegacyPermissionStateTEMP();
mSettings.readPermissionStateForUserSyncLPr(userId); mSettings.readPermissionStateForUserSyncLPr(userId);
mPermissionManager.readLegacyPermissionStateTEMP(); mPermissionManager.readLegacyPermissionStateTEMP();
@@ -26569,7 +26569,7 @@ public class PackageManagerService extends IPackageManager.Stub
if (packageName == null || alias == null) { if (packageName == null || alias == null) {
return null; return null;
} }
synchronized(mLock) { synchronized (mLock) {
final AndroidPackage pkg = mPackages.get(packageName); final AndroidPackage pkg = mPackages.get(packageName);
if (pkg == null if (pkg == null
|| shouldFilterApplicationLocked(getPackageSetting(pkg.getPackageName()), || shouldFilterApplicationLocked(getPackageSetting(pkg.getPackageName()),
@@ -26616,7 +26616,7 @@ public class PackageManagerService extends IPackageManager.Stub
if (packageName == null || ks == null) { if (packageName == null || ks == null) {
return false; return false;
} }
synchronized(mLock) { synchronized (mLock) {
final AndroidPackage pkg = mPackages.get(packageName); final AndroidPackage pkg = mPackages.get(packageName);
if (pkg == null if (pkg == null
|| shouldFilterApplicationLocked(getPackageSetting(pkg.getPackageName()), || shouldFilterApplicationLocked(getPackageSetting(pkg.getPackageName()),