Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent apk-in-apex from being registered under wrong apex" into rvc-qpr-dev

Browse Source
This commit is contained in:
Nikita Ioffe
2021-04-19 11:40:07 +00:00
committed by Android (Google) Code Review
parent a2927ef378 58cd8bc29e
commit 21d910e042
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/ApexManager.java
View File

@@ -757,12 +757,15 @@ public abstract class ApexManager {
void registerApkInApex(AndroidPackage pkg) { void registerApkInApex(AndroidPackage pkg) {
synchronized (mLock) { synchronized (mLock) {
for (ActiveApexInfo aai : mActiveApexInfosCache) { 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); List<String> apks = mApksInApex.get(aai.apexModuleName);
if (apks == null) { if (apks == null) {
apks = Lists.newArrayList(); apks = Lists.newArrayList();
mApksInApex.put(aai.apexModuleName, apks); mApksInApex.put(aai.apexModuleName, apks);
} }
Slog.i(TAG, "Registering " + pkg.getPackageName() + " as apk-in-apex of "
+ aai.apexModuleName);
apks.add(pkg.getPackageName()); apks.add(pkg.getPackageName());
} }
} }