Merge cherrypicks of [14217257, 14217258, 14217339, 14217529, 14217566, 14214972, 14217508, 14216278, 14216279, 14217530, 14217281, 14215011] into rvc-qpr3-release

android-build-team Robot · android-build-team Robot · commit ba595d5debf2 · 2021-04-17T00:08:48.000Z
Change-Id: I6d9ce7c32a28ca52edd1a595c957c9926979caf5
diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java
@@ -757,12 +757,15 @@ boolean uninstallApex(String apexPackagePath) {
         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());
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -757,12 +757,15 @@ boolean uninstallApex(String apexPackagePath) {`
`757`	`757`	`void registerApkInApex(AndroidPackage pkg) {`
`758`	`758`	`synchronized (mLock) {`
`759`	`759`	`for (ActiveApexInfo aai : mActiveApexInfosCache) {`
`760`		`- if (pkg.getBaseCodePath().startsWith(aai.apexDirectory.getAbsolutePath())) {`
	`760`	`+ if (pkg.getBaseCodePath().startsWith(`
	`761`	`+ aai.apexDirectory.getAbsolutePath() + File.separator)) {`
`761`	`762`	`List<String> apks = mApksInApex.get(aai.apexModuleName);`
`762`	`763`	`if (apks == null) {`
`763`	`764`	`apks = Lists.newArrayList();`
`764`	`765`	`mApksInApex.put(aai.apexModuleName, apks);`
`765`	`766`	`}`
	`767`	`+ Slog.i(TAG, "Registering " + pkg.getPackageName() + " as apk-in-apex of "`
	`768`	`+ + aai.apexModuleName);`
`766`	`769`	`apks.add(pkg.getPackageName());`
`767`	`770`	`}`
`768`	`771`	`}`