From 73b1e972e2cebd1e836c1e14536ed07a4166da46 Mon Sep 17 00:00:00 2001
From: Todd Kennedy <toddke@google.com>
Date: Tue, 1 Jun 2021 21:21:02 -0700
Subject: [PATCH] Use the package name and not the library name

the name of the shared library may be quite different
than the name of the package. we shouldn't assume the
two are the same.

Fixes: 189415306
Bug: 189415306
Test: atest StaticSharedLibsHostTests
Change-Id: I5c1069d195cb37a2bb0e823a889829a7b932774c
---
 .../java/com/android/server/pm/PackageManagerService.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 14861c2ddf4c4..2f2886e5b2871 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -12618,9 +12618,8 @@ public class PackageManagerService extends IPackageManager.Stub
                 if (!sharedLibraryInfo.isStatic()) {
                     continue;
                 }
-                final PackageSetting staticLibPkgSetting = getPackageSetting(
-                        toStaticSharedLibraryPackageName(sharedLibraryInfo.getName(),
-                                sharedLibraryInfo.getLongVersion()));
+                final PackageSetting staticLibPkgSetting =
+                        getPackageSetting(sharedLibraryInfo.getPackageName());
                 if (staticLibPkgSetting == null) {
                     Slog.wtf(TAG, "Shared lib without setting: " + sharedLibraryInfo);
                     continue;