Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c1e8533 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Call onCancelBatchInput only when onStartBatchInput has been called 

This NPE issue (Bug: 7903331) has been introduced by Ie68c7698.

Bug: 7903331
Change-Id: I44884f5608fe47d9db7a2c93a752d17b9ae39a22
parent 11bc86ad

java/src/com/android/inputmethod/keyboard/PointerTracker.java

+4 −3
Original line number Diff line number Diff line
@@ -791,6 +791,9 @@ public final class PointerTracker implements PointerTrackerQueue.Element { 


    private void cancelBatchInput() {

        sPointerTrackerQueue.cancelAllPointerTracker();

        if (!sInGesture) {

            return;

        }

        sInGesture = false;

        if (DEBUG_LISTENER) {

            Log.d(TAG, String.format("[%d] onCancelBatchInput", mPointerId));
@@ -1208,9 +1211,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { 
            printTouchEvent("onCancelEvt:", x, y, eventTime);

        }



        if (sInGesture) {

        cancelBatchInput();

        }

        sPointerTrackerQueue.cancelAllPointerTracker();

        sPointerTrackerQueue.releaseAllPointers(eventTime);

        onCancelEventInternal();