| commit | 10cb450ff57118457bb7467aea7e62f472b2e031 | [log] [tgz] |
|---|---|---|
| author | Jeongsik Mun <jeongsik.mun@samsung.com> | Mon Aug 10 17:58:10 2020 +0900 |
| committer | Todd Kennedy <toddke@google.com> | Thu Aug 27 04:20:08 2020 +0000 |
| tree | 0ade9e52a905f56782df2a1b8a9a152bbcdc4e17 | |
| parent | 45c1b35d205f1e473059c8ec6d31e38107022182 [diff] |
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)
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index eefad1c..0cec95d 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 @@ final PackageSetting ps; int appId = -1; long ceDataInode = -1; - synchronized (mSettings) { + synchronized (mLock) { ps = mSettings.getPackageLPr(packageName); if (ps != null) { appId = ps.appId;