summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-11-12 19:30:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-11-12 19:30:21 +0000
commit901b609c95b634d9df9f2d5c14cae3f6a46ee359 (patch)
treebb7152baea118730a84001225f31857f216438b1
parent0486a1aba611e48de4ec242e24939eb46e5df37d (diff)
parentccd1a25b3eab5ce75f1441ef7dbf8d781cf29fb9 (diff)
Merge "Use name instead of package name" am: 9b2537195c am: 0b307f3272 am: ccd1a25b3e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1457859 Change-Id: I53add6dbf40455a46e57e8d1a4fbb2ea1ed93322
-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 f7d1a5926bcb..973d06f7ab81 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -10573,7 +10573,7 @@ public class PackageManagerService extends IPackageManager.Stub
continue;
}
final PackageSetting staticLibPkgSetting = getPackageSetting(
- toStaticSharedLibraryPackageName(sharedLibraryInfo.getPackageName(),
+ toStaticSharedLibraryPackageName(sharedLibraryInfo.getName(),
sharedLibraryInfo.getLongVersion()));
if (staticLibPkgSetting == null) {
Slog.wtf(TAG, "Shared lib without setting: " + sharedLibraryInfo);