Merge "Fix getActiveApexInfos for ApexManagerFlattenedApex"

2020-07-16 12:57:41 +00:00
parent a144ce21bf 56c6ba3917
commit 958b084b05
1 changed files with 7 additions and 2 deletions
--- a/services/core/java/com/android/server/pm/ApexManager.java
+++ b/services/core/java/com/android/server/pm/ApexManager.java
@@ -1031,12 +1031,17 @@ public abstract class ApexManager {
                if (files != null) {
                    for (File file : files) {
                        if (file.isDirectory() && !file.getName().contains("@")) {
+                            boolean skip = false;
                            for (String skipDir : skipDirs) {
                                if (file.getName().equals(skipDir)) {
-                                    continue;
+                                    skip = true;
+                                    break;
                                }
                            }
-                            result.add(new ActiveApexInfo(file, Environment.getRootDirectory()));
+                            if (!skip) {
+                                result.add(
+                                    new ActiveApexInfo(file, Environment.getRootDirectory()));
+                            }
                        }
                    }
                }