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

Commit 958b084b authored by Mohammad Samiul Islam's avatar Mohammad Samiul Islam Committed by Android (Google) Code Review
Browse files

Merge "Fix getActiveApexInfos for ApexManagerFlattenedApex"

parents a144ce21 56c6ba39

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

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

                                }

                            }

                            if (!skip) {

                                result.add(

                                    new ActiveApexInfo(file, Environment.getRootDirectory()));

                            }

                            result.add(new ActiveApexInfo(file, Environment.getRootDirectory()));

                        }

                    }

                }