From 56c6ba39176047d2d0533ec3dc10f12aafe3335f Mon Sep 17 00:00:00 2001
From: Mohammad Samiul Islam <samiul@google.com>
Date: Mon, 13 Jul 2020 20:10:49 +0100
Subject: [PATCH] Fix getActiveApexInfos for ApexManagerFlattenedApex

The for loop in existing code is redundant. It is supposed to filter out
some items when generating result.

Bug: 161150361
Test: m OVERRIDE_TARGET_FLATTEN_APEX=true
Test: atest ApexManagerTest
Change-Id: I0ff04b2b500f555ae6e34b9c87b7dc57e3bccaf3
---
 .../core/java/com/android/server/pm/ApexManager.java     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java
index 592db83b87218..9bc769db520fa 100644
--- a/services/core/java/com/android/server/pm/ApexManager.java
+++ b/services/core/java/com/android/server/pm/ApexManager.java
@@ -1023,12 +1023,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()));
+                            }
                         }
                     }
                 }