From 10cb450ff57118457bb7467aea7e62f472b2e031 Mon Sep 17 00:00:00 2001
From: Jeongsik Mun <jeongsik.mun@samsung.com>
Date: Mon, 10 Aug 2020 17:58:10 +0900
Subject: Fix usage of the wrong lock in PackageManager (mLock instead of
 mSettings)

Bug: 162757028
Bug: 166537195
Test: compile & verify basic functions working
Change-Id: Ie822d8f2267dcb8ce382e91ab5de365a4e0ce19f
Merged-In: Ie822d8f2267dcb8ce382e91ab5de365a4e0ce19f
(cherry picked from commit 1690689bc44d82d57e9ea12d44ef32d18dcb1326)
---
 services/core/java/com/android/server/pm/PackageManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index eefad1c8eed2..0cec95d2fa89 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -14501,7 +14501,7 @@ public class PackageManagerService extends IPackageManager.Stub
         final PackageSetting ps;
         int appId = -1;
         long ceDataInode = -1;
-        synchronized (mSettings) {
+        synchronized (mLock) {
             ps = mSettings.getPackageLPr(packageName);
             if (ps != null) {
                 appId = ps.appId;
-- 
cgit v1.2.3-59-g8ed1b