Merge "Makes GesturesObserver#clear as a private method." into tm-dev

services/accessibility/java/com/android/server/accessibility/magnification/GesturesObserver.java

@@ -114,7 +114,7 @@ public final class GesturesObserver implements GestureMatcher.StateChangeListene
      * Clears all states to default.
      */
     @MainThread
-    public void clear() {
+    private void clear() {
         for (GestureMatcher matcher : mGestureMatchers) {
             matcher.clear();
         }

services/accessibility/java/com/android/server/accessibility/magnification/MagnificationGesturesObserver.java

@@ -133,7 +133,7 @@ class MagnificationGesturesObserver implements GesturesObserver.Listener {
         mDelayedEventQueue = null;
         mCallback.onGestureCompleted(gestureId, mLastDownEventTime, delayEventQueue,
                 event);
-        recycleLastEvent();
+        clear();
     }
 
     @Override
@@ -149,19 +149,18 @@ class MagnificationGesturesObserver implements GesturesObserver.Listener {
         mDelayedEventQueue = null;
         mCallback.onGestureCancelled(mLastDownEventTime, delayEventQueue,
                 mLastEvent);
-        recycleLastEvent();
+        clear();
     }
 
     /**
      * Resets all state to default.
      */
-    void clear() {
+    private void clear() {
         if (DBG) {
             Slog.d(LOG_TAG, "clear:" + mDelayedEventQueue);
         }
         recycleLastEvent();
         mLastDownEventTime = 0;
-        mGesturesObserver.clear();
         if (mDelayedEventQueue != null) {
             for (MotionEventInfo eventInfo2: mDelayedEventQueue) {
                 eventInfo2.recycle();

services/accessibility/java/com/android/server/accessibility/magnification/WindowMagnificationGestureHandler.java

@@ -439,21 +439,11 @@ public class WindowMagnificationGestureHandler extends MagnificationGestureHandl
                     new TwoFingersDownOrSwipe(context));
         }
 
-        @Override
-        public void onExit() {
-            clear();
-        }
-
         @Override
         public void onMotionEvent(MotionEvent event, MotionEvent rawEvent, int policyFlags) {
             mGesturesObserver.onMotionEvent(event, rawEvent, policyFlags);
         }
 
-        @Override
-        public void clear() {
-            mGesturesObserver.clear();
-        }
-
         @Override
         public String toString() {
             return "DetectingState{"