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

Merge "Don't update cached ApplicationInfo with old information"

Browse Source
This commit is contained in:
Jeremy Meyer
2021-12-10 18:41:07 +00:00
committed by Android (Google) Code Review
parent ac5575654b 99a2847acb
commit 85c6cf1646
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/app/ActivityThread.java
View File

@@ -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;

11
core/java/android/content/pm/ApplicationInfo.java
View File

@@ -1147,6 +1147,12 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
@UnsupportedAppUsage
public int versionCode;
/**
* The timestamp of when this ApplicationInfo was created.
* @hide
*/
public long createTimestamp;
/**
* The user-visible SDK version (ex. 26) of the framework against which the application claims
* to have been compiled, or {@code 0} if not specified.
@@ -1639,6 +1645,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
+ requestRawExternalStorageAccess);
}
}
pw.println(prefix + "createTimestamp=" + createTimestamp);
super.dumpBack(pw, prefix);
}
@@ -1796,6 +1803,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
}
public ApplicationInfo() {
createTimestamp = System.currentTimeMillis();
}
public ApplicationInfo(ApplicationInfo orig) {
@@ -1867,6 +1875,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
memtagMode = orig.memtagMode;
nativeHeapZeroInitialized = orig.nativeHeapZeroInitialized;
requestRawExternalStorageAccess = orig.requestRawExternalStorageAccess;
createTimestamp = System.currentTimeMillis();
}
public String toString() {
@@ -1957,6 +1966,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
dest.writeInt(memtagMode);
dest.writeInt(nativeHeapZeroInitialized);
sForBoolean.parcel(requestRawExternalStorageAccess, dest, parcelableFlags);
dest.writeLong(createTimestamp);
}
public static final @android.annotation.NonNull Parcelable.Creator<ApplicationInfo> CREATOR
@@ -2044,6 +2054,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
memtagMode = source.readInt();
nativeHeapZeroInitialized = source.readInt();
requestRawExternalStorageAccess = sForBoolean.unparcel(source);
createTimestamp = source.readLong();
}
/**