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

Commit bd1ad245 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 

Change-Id: I2b395dcfc1c7159446edf3f9151b500a50d76eda
parents d8ddb246 c023f447

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;