Merge "GestureManifold: fix null pointer exception in onGestureCompleted." into rvc-dev am: cee5a21750 am: 1b74f8b31e

Change-Id: I6451506a83e5103938ef998cbd8c4112383b9268

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

@@ -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");
     }
 }

services/accessibility/java/com/android/server/accessibility/gestures/GestureManifold.java

@@ -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) {

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

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