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

Commit 21d910e0 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Android (Google) Code Review
Browse files

Merge "Prevent apk-in-apex from being registered under wrong apex" into rvc-qpr-dev

parents a2927ef3 58cd8bc2

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

+4 −1
Original line number Diff line number Diff line
@@ -757,12 +757,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());

                    }

                }