Merge "Invalidate PackageInfo cache when overlays change" into rvc-dev (71765aa9) · Commits · e / os / android_frameworks_base

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

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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");
	}		}
	}		}

services/core/java/com/android/server/pm/PackageManagerService.java

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -24510,10 +24510,11 @@ public class PackageManagerService extends IPackageManager.Stub
	if (updatedPackageNames != null) {		if (updatedPackageNames != null) {
	outUpdatedPackageNames.addAll(updatedPackageNames);		outUpdatedPackageNames.addAll(updatedPackageNames);
	}		}
			}

			PackageManager.invalidatePackageInfoCache();
	return true;		return true;
	}		}
	}

	@Override		@Override
	public ResolveInfo resolveIntent(Intent intent, String resolvedType,		public ResolveInfo resolveIntent(Intent intent, String resolvedType,