diff options
| author | 2021-08-05 03:34:31 +0000 | |
|---|---|---|
| committer | 2021-08-05 03:34:31 +0000 | |
| commit | 10f3936af26e3ab948ad1d65a09260dc9dab31dd (patch) | |
| tree | d6dc9ed70873364ff3519baef2cface74981b524 | |
| parent | 64a00e5ce6a53efdc3e914a75098740ce2962b6a (diff) | |
| parent | 1a32fc6b5a21036115d306a46e2d6f8be31c8cf3 (diff) | |
Merge "Correct locking in PackageManagerService" into sc-dev am: 1a32fc6b5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15463553
Change-Id: Ie0fddbf344cac9021b089a1f4421d939151fa236
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 031910a81260..904a1f0d6f4f 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -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()), |