Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4084673 authored by Winson Chiu's avatar Winson Chiu Committed by Automerger Merge Worker
Browse files

Merge "Calculate oldPaths for out of date LoadedApks" into rvc-dev am: c023f447 am: 30425ea8 

Change-Id: I3f5e8c8b73fbe58ae6b8862363abacfda6744cf0
parents d6d7e9d8 30425ea8

core/java/android/app/ActivityThread.java

+6 −2
Original line number Diff line number Diff line
@@ -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;