diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-17 00:08:48 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-17 00:08:48 +0000 |
commit | ba595d5debf2a214e05a8a774be658b09b354d1a (patch) | |
tree | 7f99f3751625ce0b6e31021d5073bf9e9c3853b7 | |
parent | de4179c62456ea3ecc19e692440384a43940b671 (diff) | |
parent | 301aaf691f185572246721cfa43f5e8a54830d1e (diff) | |
download | base-ba595d5debf2a214e05a8a774be658b09b354d1a.tar.gz |
Merge cherrypicks of [14217257, 14217258, 14217339, 14217529, 14217566, 14214972, 14217508, 14216278, 14216279, 14217530, 14217281, 14215011] into rvc-qpr3-releaseandroid-11.0.0_r38
Change-Id: I6d9ce7c32a28ca52edd1a595c957c9926979caf5
-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()); } } |