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

Commit d39d129f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE - Merge RQ3A.210605.005" into stage-aosp-master

parents 75acf0f8 a779288e

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

+4 −1
Original line number Diff line number Diff line
@@ -782,12 +782,15 @@ public abstract class ApexManager { 
        void registerApkInApex(AndroidPackage pkg) {

            synchronized (mLock) {

                for (ActiveApexInfo aai : mActiveApexInfosCache) {

                    if (pkg.getBaseCodePath().startsWith(aai.apexDirectory.getAbsolutePath())) {

                    if (pkg.getBaseCodePath().startsWith(

                            aai.apexDirectory.getAbsolutePath() + File.separator)) {

                        List<String> apks = mApksInApex.get(aai.apexModuleName);

                        if (apks == null) {

                            apks = Lists.newArrayList();

                            mApksInApex.put(aai.apexModuleName, apks);

                        }

                        Slog.i(TAG, "Registering " + pkg.getPackageName() + " as apk-in-apex of "

                                + aai.apexModuleName);

                        apks.add(pkg.getPackageName());

                    }

                }