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

Merge "Invalidate PackageInfo cache when overlays change" into rvc-dev

Browse Source
This commit is contained in:
Ryan Mitchell
2020-05-21 20:22:07 +00:00
committed by Android (Google) Code Review
parent 7980546c03 5aa617a3da
commit 71765aa97c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/tests/overlaytests/remount/src/com/android/overlaytest/remounted/PackagedUpgradedTest.java
View File

@@ -47,6 +47,7 @@ public class PackagedUpgradedTest extends OverlayRemountedTestBase {
@Test @Test
public void testTargetRelocated() throws Exception { public void testTargetRelocated() throws Exception {
final String targetOverlaid = resourceName(TARGET_PACKAGE, "bool", "target_overlaid"); final String targetOverlaid = resourceName(TARGET_PACKAGE, "bool", "target_overlaid");
final String targetReference = resourceName(TARGET_PACKAGE, "bool", "target_reference");
final String originalPath = "/product/app/OverlayTarget.apk"; final String originalPath = "/product/app/OverlayTarget.apk";
mPreparer.pushResourceFile(TARGET_APK, originalPath) mPreparer.pushResourceFile(TARGET_APK, originalPath)
@@ -54,6 +55,7 @@ public class PackagedUpgradedTest extends OverlayRemountedTestBase {
.installResourceApk(OVERLAY_APK, OVERLAY_PACKAGE) .installResourceApk(OVERLAY_APK, OVERLAY_PACKAGE)
.setOverlayEnabled(OVERLAY_PACKAGE, true); .setOverlayEnabled(OVERLAY_PACKAGE, true);
assertResource(targetReference, "@" + 0x7f010000 + " -> true");
assertResource(targetOverlaid, "true"); assertResource(targetOverlaid, "true");
mPreparer.remount(); mPreparer.remount();
@@ -61,6 +63,7 @@ public class PackagedUpgradedTest extends OverlayRemountedTestBase {
mPreparer.pushResourceFile(TARGET_UPGRADE_APK, "/product/app/OverlayTarget2.apk") mPreparer.pushResourceFile(TARGET_UPGRADE_APK, "/product/app/OverlayTarget2.apk")
.reboot(); .reboot();
assertResource(targetReference, "@" + 0x7f0100ff + " -> true");
assertResource(targetOverlaid, "true"); assertResource(targetOverlaid, "true");
} }
} }

5
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -24510,9 +24510,10 @@ public class PackageManagerService extends IPackageManager.Stub
if (updatedPackageNames != null) { if (updatedPackageNames != null) {
outUpdatedPackageNames.addAll(updatedPackageNames); outUpdatedPackageNames.addAll(updatedPackageNames);
} }
return true;
} }
PackageManager.invalidatePackageInfoCache();
return true;
} }
@Override @Override