Merge "GestureManifold: fix null pointer exception in onGestureCompleted."... (d9b7a0a7) · Commits · e / os / android_frameworks_base

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ public class PackagedUpgradedTest extends OverlayRemountedTestBase {
		@Test
		public void testTargetRelocated() throws Exception {
		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";

		mPreparer.pushResourceFile(TARGET_APK, originalPath)
		@@ -54,6 +55,7 @@ public class PackagedUpgradedTest extends OverlayRemountedTestBase {
		.installResourceApk(OVERLAY_APK, OVERLAY_PACKAGE)
		.setOverlayEnabled(OVERLAY_PACKAGE, true);

		assertResource(targetReference, "@" + 0x7f010000 + " -> true");
		assertResource(targetOverlaid, "true");

		mPreparer.remount();
		@@ -61,6 +63,7 @@ public class PackagedUpgradedTest extends OverlayRemountedTestBase {
		mPreparer.pushResourceFile(TARGET_UPGRADE_APK, "/product/app/OverlayTarget2.apk")
		.reboot();

		assertResource(targetReference, "@" + 0x7f0100ff + " -> true");
		assertResource(targetOverlaid, "true");
		}
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -295,7 +295,7 @@ class GestureManifold implements GestureMatcher.StateChangeListener {
		mListener.onGestureStarted();
		}
		} else if (state == GestureMatcher.STATE_GESTURE_COMPLETED) {
		onGestureCompleted(gestureId);
		onGestureCompleted(gestureId, event, rawEvent, policyFlags);
		} else if (state == GestureMatcher.STATE_GESTURE_CANCELED && mState.isGestureDetecting()) {
		// We only want to call the cancelation callback if there are no other pending
		// detectors.
		@@ -311,8 +311,8 @@ class GestureManifold implements GestureMatcher.StateChangeListener {
		}
		}

		private void onGestureCompleted(int gestureId) {
		MotionEvent event = mState.getLastReceivedEvent();
		private void onGestureCompleted(
		int gestureId, MotionEvent event, MotionEvent rawEvent, int policyFlags) {
		// Note that gestures that complete immediately call clear() from onMotionEvent.
		// Gestures that complete on a delay call clear() here.
		switch (gestureId) {

+3 −2

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

		PackageManager.invalidatePackageInfoCache();
		return true;
		}
		}

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