summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-08-26 00:51:28 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-08-26 00:51:28 +0000
commit5d286a6dda84661412b6d0080f0259633ceb0130 (patch)
tree7a24a593637efb9f7531fc89b0f289a8b257ea8d
parent7298ec007b3a10d3908646987c92a77f7b8c6b3f (diff)
parent1690689bc44d82d57e9ea12d44ef32d18dcb1326 (diff)
Merge "Fix usage of the wrong lock in PackageManager (mLock instead of mSettings)"
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index c488a1716219..c377e8c410a8 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -14656,7 +14656,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;