Merge "[pm] drop non-APK paths from LoadedApk makePath" into sc-dev

2021-06-23 20:19:32 +00:00
parent fb1dc9e3db fece532bbf
commit 56b4df6954
1 changed files with 4 additions and 0 deletions
--- a/core/java/android/app/LoadedApk.java
+++ b/core/java/android/app/LoadedApk.java
@@ -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++;