diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-18 17:59:30 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-18 17:59:30 +0000 |
| commit | 152936b331dd9271550a779d6cb27aba3455716a (patch) | |
| tree | 7f99f3751625ce0b6e31021d5073bf9e9c3853b7 | |
| parent | 3014c5549a8921f1a179ccf91194f7712a0308d1 (diff) | |
| parent | 46d2f8bcb93cc5c8b21cf52bc1a15fc9d0b0a974 (diff) | |
| download | base-android-11.0.0_r41.tar.gz | |
Merge cherrypicks of [14230649, 14230629, 14230666, 14230630, 14230650, 14230611, 14230612] into rvc-d2-releaseandroid-11.0.0_r42android-11.0.0_r41
Change-Id: If248ed0f6dfe010665808538eb7e28292d103a75
| -rw-r--r-- | services/core/java/com/android/server/pm/ApexManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java index d9d949154ce1..1be8390a8757 100644 --- a/services/core/java/com/android/server/pm/ApexManager.java +++ b/services/core/java/com/android/server/pm/ApexManager.java @@ -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()); } } |