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

Merge "Invalidate the cache for APK-in-APEX" into rvc-dev

Browse Source
This commit is contained in:
Jackal Guo
2020-04-21 01:21:33 +00:00
committed by Android (Google) Code Review
parent 9c5a02c269 63aa98db6d
commit 6959c37c5f
4 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/android/content/pm/PackageManagerInternal.java
View File

@@ -479,6 +479,12 @@ public abstract class PackageManagerInternal {
*/
public abstract void pruneInstantApps();
/**
* Prunes the cache of the APKs in the given APEXes.
* @param apexPackages The list of APEX packages that may contain APK-in-APEX.
*/
public abstract void pruneCachedApksInApex(@NonNull List<PackageInfo> apexPackages);
/**
* @return The SetupWizard package name.
*/

20
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -351,6 +351,7 @@ import com.android.server.pm.dex.DexManager;
import com.android.server.pm.dex.DexoptOptions;
import com.android.server.pm.dex.PackageDexUsage;
import com.android.server.pm.dex.ViewCompiler;
import com.android.server.pm.parsing.PackageCacher;
import com.android.server.pm.parsing.PackageInfoUtils;
import com.android.server.pm.parsing.PackageParser2;
import com.android.server.pm.parsing.library.PackageBackwardCompatibility;
@@ -24231,6 +24232,25 @@ public class PackageManagerService extends IPackageManager.Stub
mInstantAppRegistry.pruneInstantApps();
}
@Override
public void pruneCachedApksInApex(@NonNull List<PackageInfo> apexPackages) {
if (mCacheDir == null) {
return;
}
final PackageCacher cacher = new PackageCacher(mCacheDir);
synchronized (mLock) {
for (int i = 0, size = apexPackages.size(); i < size; i++) {
final List<String> apkNames =
mApexManager.getApksInApex(apexPackages.get(i).packageName);
for (int j = 0, apksInApex = apkNames.size(); j < apksInApex; j++) {
final AndroidPackage pkg = getPackage(apkNames.get(j));
cacher.cleanCachedResult(new File(pkg.getCodePath()));
}
}
}
}
@Override
public String getSetupWizardPackageName() {
return mSetupWizardPackage;

7
services/core/java/com/android/server/pm/StagingManager.java
View File

@@ -1226,8 +1226,9 @@ public class StagingManager {
// APEX checks. For single-package sessions, check if they contain an APEX. For
// multi-package sessions, find all the child sessions that contain an APEX.
if (hasApex) {
final List<PackageInfo> apexPackages;
try {
final List<PackageInfo> apexPackages = submitSessionToApexService(session);
apexPackages = submitSessionToApexService(session);
for (int i = 0, size = apexPackages.size(); i < size; i++) {
validateApexSignature(apexPackages.get(i));
}
@@ -1235,6 +1236,10 @@ public class StagingManager {
session.setStagedSessionFailed(e.error, e.getMessage());
return;
}
final PackageManagerInternal packageManagerInternal =
LocalServices.getService(PackageManagerInternal.class);
packageManagerInternal.pruneCachedApksInApex(apexPackages);
}
notifyPreRebootVerification_Apex_Complete(session.sessionId);

15
services/core/java/com/android/server/pm/parsing/PackageCacher.java
View File

@@ -18,6 +18,7 @@ package com.android.server.pm.parsing;
import android.annotation.NonNull;
import android.content.pm.PackageParserCacheHelper;
import android.os.FileUtils;
import android.os.Parcel;
import android.system.ErrnoException;
import android.system.Os;
@@ -197,4 +198,18 @@ public class PackageCacher {
Slog.w(TAG, "Error saving package cache.", e);
}
}
/**
* Delete the cache files for the given {@code packageFile}.
*/
public void cleanCachedResult(@NonNull File packageFile) {
final String packageName = packageFile.getName();
final File[] files = FileUtils.listFilesOrEmpty(mCacheDir,
(dir, name) -> name.startsWith(packageName));
for (File file : files) {
if (!file.delete()) {
Slog.e(TAG, "Unable to clean cache file: " + file);
}
}
}
}