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: I517b17fc7ce11d1a2454271407406e803cd3525c
This commit is contained in:
Lee Shombert
2021-08-05 03:31:52 +00:00
committed by Automerger Merge Worker

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();