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

Merge "Calculate oldPaths for out of date LoadedApks" into rvc-dev am: c023f4474b am: bd1ad2453d

Browse Source 
Change-Id: I2d7a83a15c0fdf3a87f930a67ddb670b3290151d
This commit is contained in:
Winson Chiu
2020-04-23 01:18:38 +00:00
committed by Automerger Merge Worker
parent d6d7e9d8b2 bd1ad2453d
commit 66170e2afa
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/ActivityThread.java
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;