diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-18 11:38:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-06-18 11:38:15 +0000 |
| commit | d39d129fdb1fc6e420868d9a0d653f14a1dd646c (patch) | |
| tree | b1e1c31dcf5bec147db673e9a8401770438fe724 | |
| parent | 75acf0f8d9c773f49ae2ccd932440e951d0a3fa0 (diff) | |
| parent | a779288e19da55c582c5e4e369ef01d192bf64b8 (diff) | |
| download | base-tmp_sam_RQ3A.210605.005.tar.gz | |
Merge "DO NOT MERGE - Merge RQ3A.210605.005" into stage-aosp-mastertmp_sam_RQ3A.210605.005
| -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 cb0af1117241..378405ffdb4a 100644 --- 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()); } } |