summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Todd Kennedy <toddke@google.com> 2021-06-01 21:24:29 -0700
committer Patrick Baumann <patb@google.com> 2021-06-02 14:48:38 +0000
commit6fe434da819d39c3252fce034d397f6a68253e79 (patch)
tree1e7bafe47577142123197071ff8d8b62608b4982
parentee4d86d0c1f04fdb676ae67d508ca92b167c30b9 (diff)
Track the correct package manager field
Static shared libraries were not being properly tracked and snapshotted. This meant that any lookups that didn't involve the live data structure were incorrect; it was as if the platform had no static shared libraries at all. Fixes: 189851804 Bug: 188661399 Bug: 189851804 Test: atest StaticSharedLibsHostTests Change-Id: Ia48cf95903bfc8ad194890b5408c8b1f96793ec4
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 14861c2ddf4c..604e9d470fd5 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -1413,8 +1413,8 @@ public class PackageManagerService extends IPackageManager.Stub
mStaticLibsByDeclaringPackage = new WatchedArrayMap<>();
private final SnapshotCache<WatchedArrayMap<String, WatchedLongSparseArray<SharedLibraryInfo>>>
mStaticLibsByDeclaringPackageSnapshot =
- new SnapshotCache.Auto<>(mSharedLibraries, mSharedLibraries,
- "PackageManagerService.mSharedLibraries");
+ new SnapshotCache.Auto<>(mStaticLibsByDeclaringPackage, mStaticLibsByDeclaringPackage,
+ "PackageManagerService.mStaticLibsByDeclaringPackage");
// Mapping from instrumentation class names to info about them.
@Watched