Merge "Calculate oldPaths for out of date LoadedApks" into rvc-dev (c023f447) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2235,7 +2235,9 @@ public final class ActivityThread extends ClientTransactionHandler {
	LoadedApk packageInfo = ref != null ? ref.get() : null;		LoadedApk packageInfo = ref != null ? ref.get() : null;
	if (ai != null && packageInfo != null) {		if (ai != null && packageInfo != null) {
	if (!isLoadedApkResourceDirsUpToDate(packageInfo, ai)) {		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()		if (packageInfo.isSecurityViolation()
	@@ -2323,7 +2325,9 @@ public final class ActivityThread extends ClientTransactionHandler {

	if (packageInfo != null) {		if (packageInfo != null) {
	if (!isLoadedApkResourceDirsUpToDate(packageInfo, aInfo)) {		if (!isLoadedApkResourceDirsUpToDate(packageInfo, aInfo)) {
	packageInfo.updateApplicationInfo(aInfo, null);		List<String> oldPaths = new ArrayList<>();
			LoadedApk.makePaths(this, aInfo, oldPaths);
			packageInfo.updateApplicationInfo(aInfo, oldPaths);
	}		}

	return packageInfo;		return packageInfo;