Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8a9c333 authored by Todd Kennedy's avatar Todd Kennedy Committed by Automerger Merge Worker
Browse files

Merge "Use the package name and not the library name" into sc-dev am: 6a0fa923 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14776219

Change-Id: I14a48616f4c5590720bcd03e5010d1f22e64cc71
parents 6ef6ed73 6a0fa923

services/core/java/com/android/server/pm/PackageManagerService.java

+2 −3
Original line number Diff line number Diff line
@@ -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;