Merge "Calculate oldPaths for out of date LoadedApks" into rvc-dev

This commit is contained in:
Winson Chiu
2020-04-23 00:44:57 +00:00
committed by Android (Google) Code Review

View File

@@ -2235,7 +2235,9 @@ public final class ActivityThread extends ClientTransactionHandler {
LoadedApk packageInfo = ref != null ? ref.get() : null;
if (ai != null && packageInfo != null) {
if (!isLoadedApkResourceDirsUpToDate(packageInfo, ai)) {
packageInfo.updateApplicationInfo(ai, null);
List<String> oldPaths = new ArrayList<>();
LoadedApk.makePaths(this, ai, oldPaths);
packageInfo.updateApplicationInfo(ai, oldPaths);
}
if (packageInfo.isSecurityViolation()
@@ -2323,7 +2325,9 @@ public final class ActivityThread extends ClientTransactionHandler {
if (packageInfo != null) {
if (!isLoadedApkResourceDirsUpToDate(packageInfo, aInfo)) {
packageInfo.updateApplicationInfo(aInfo, null);
List<String> oldPaths = new ArrayList<>();
LoadedApk.makePaths(this, aInfo, oldPaths);
packageInfo.updateApplicationInfo(aInfo, oldPaths);
}
return packageInfo;