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 am: 1a32fc6b5a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15463553

Change-Id: Ie0fddbf344cac9021b089a1f4421d939151fa236
This commit is contained in:
Lee Shombert
2021-08-05 03:34:31 +00:00
committed by Automerger Merge Worker
parent 64a00e5ce6 1a32fc6b5a
commit 10f3936af2
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) {
synchronized (mPackages) {
synchronized (mLock) {
mPermissionManager.writeLegacyPermissionStateTEMP();
mSettings.readPermissionStateForUserSyncLPr(userId);
mPermissionManager.readLegacyPermissionStateTEMP();
@@ -26569,7 +26569,7 @@ public class PackageManagerService extends IPackageManager.Stub
if (packageName == null || alias == null) {
return null;
}
synchronized(mLock) {
synchronized (mLock) {
final AndroidPackage pkg = mPackages.get(packageName);
if (pkg == null
|| shouldFilterApplicationLocked(getPackageSetting(pkg.getPackageName()),
@@ -26616,7 +26616,7 @@ public class PackageManagerService extends IPackageManager.Stub
if (packageName == null || ks == null) {
return false;
}
synchronized(mLock) {
synchronized (mLock) {
final AndroidPackage pkg = mPackages.get(packageName);
if (pkg == null
|| shouldFilterApplicationLocked(getPackageSetting(pkg.getPackageName()),