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

Commit 9d60722c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[pm] drop non-APK paths from LoadedApk makePath" into sc-dev am: 56b4df69 am: 2ba1b392 

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

Change-Id: I668ebbac4d56dde3f11a6edab91f721f0e21ee1a
parents cd035a15 2ba1b392

core/java/android/app/LoadedApk.java

+4 −0
Original line number Diff line number Diff line
@@ -546,6 +546,10 @@ public final class LoadedApk { 
        if (aInfo.sharedLibraryFiles != null) {

            int index = 0;

            for (String lib : aInfo.sharedLibraryFiles) {

                // sharedLibraryFiles might contain native shared libraries that are not APK paths.

                if (!lib.endsWith(".apk")) {

                    continue;

                }

                if (!outSeenPaths.contains(lib) && !outZipPaths.contains(lib)) {

                    outZipPaths.add(index, lib);

                    index++;