diff options
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 4ffe46ebe47d..1c53fbd4de49 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -38,10 +38,8 @@ import static android.window.ConfigurationHelper.shouldUpdateResources; import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE; -import android.annotation.ElapsedRealtimeLong; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.UptimeMillisLong; import android.app.RemoteServiceException.BadForegroundServiceNotificationException; import android.app.RemoteServiceException.CannotDeliverBroadcastException; import android.app.RemoteServiceException.CannotPostForegroundServiceNotificationException; @@ -2548,9 +2546,18 @@ public final class ActivityThread extends ClientTransactionHandler if (packageInfo != null) { if (!isLoadedApkResourceDirsUpToDate(packageInfo, aInfo)) { - List<String> oldPaths = new ArrayList<>(); - LoadedApk.makePaths(this, aInfo, oldPaths); - packageInfo.updateApplicationInfo(aInfo, oldPaths); + if (packageInfo.getApplicationInfo().createTimestamp > aInfo.createTimestamp) { + // The cached loaded apk is newer than the one passed in, we should not + // update the cached version + Slog.w(TAG, "getPackageInfo() called with an older ApplicationInfo " + + "than the cached version for package " + aInfo.packageName); + } else { + Slog.v(TAG, "getPackageInfo() caused update to cached ApplicationInfo " + + "for package " + aInfo.packageName); + List<String> oldPaths = new ArrayList<>(); + LoadedApk.makePaths(this, aInfo, oldPaths); + packageInfo.updateApplicationInfo(aInfo, oldPaths); + } } return packageInfo; |