Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 407e574b authored by Winson's avatar Winson
Browse files

Fix locking mPackages instead of correct mLock 

Wasn't caught when merging the refactor.

Bug: 147132853

Change-Id: Ieaa203b0f5b7bffcf34241020e285b794304018c
parent 45328cdf

services/core/java/com/android/server/pm/PackageManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -22779,7 +22779,7 @@ public class PackageManagerService extends IPackageManager.Stub 
            ArrayList<String> systemPackageNames = new ArrayList<>(pkgNames.length);















            for (String pkgName: pkgNames) {













                synchronized (mPackages) {













                synchronized (mLock) {















                    if (pkgName == null) {















                        continue;















                    }










@@ -23615,7 +23615,7 @@ public class PackageManagerService extends IPackageManager.Stub



























    @Nullable















    public PackageSetting getPackageSetting(String packageName) {













        synchronized (mPackages) {













        synchronized (mLock) {















            packageName = resolveInternalPackageNameLPr(















                    packageName, PackageManager.VERSION_CODE_HIGHEST);















            return mSettings.mPackages.get(packageName);