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

2021-06-18 11:38:15 +00:00
parent 75acf0f8d9 a779288e19
commit d39d129fdb
1 changed files with 4 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/ApexManager.java
+++ b/services/core/java/com/android/server/pm/ApexManager.java
@@ -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());
                    }
                }