Merge "Use the package name and not the library name" into sc-dev

2021-06-02 14:47:21 +00:00
parent 8257b7b3af 73b1e972e2
commit 6a0fa92399
1 changed files with 2 additions and 3 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -13224,9 +13224,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;