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

Commit aa4f56fe authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix incorrect logic in touch explorer state transitions." into udc-dev am: 84c2fd77 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22722361



Change-Id: I89b9b90012a7f80a3d73bfaddc9c125242bb23eb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d435b718 84c2fd77

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

+16 −7
Original line number Diff line number Diff line
@@ -1417,20 +1417,29 @@ public class TouchExplorer extends BaseEventStreamTransformation 
                    mSendTouchExplorationEndDelayed.forceSendAndRemove();

                }

            }

            if (!mState.isTouchInteracting()) {

            if (!mState.isTouchInteracting() && !mState.isDragging()) {

                // It makes no sense to delegate.

                Slog.e(LOG_TAG, "Error: Trying to delegate from "

                Slog.e(

                        LOG_TAG,

                        "Error: Trying to delegate from "

                                + mState.getStateSymbolicName(mState.getState()));

                return;

            }

            mState.startDelegating();

            MotionEvent prototype = mState.getLastReceivedEvent();

            if (prototype == null) {

            MotionEvent event = mState.getLastReceivedEvent();

            MotionEvent rawEvent = mState.getLastReceivedRawEvent();

            if (event == null || rawEvent == null) {

                Slog.d(LOG_TAG, "Unable to start delegating: unable to get last received event.");

                return;

            }

            int policyFlags = mState.getLastReceivedPolicyFlags();

            mDispatcher.sendDownForAllNotInjectedPointers(prototype, policyFlags);

            if (mState.isDragging()) {

                // Send an event to the end of the drag gesture.

                mDispatcher.sendMotionEvent(

                        event, ACTION_UP, rawEvent, ALL_POINTER_ID_BITS, policyFlags);

            }

            mState.startDelegating();

            // Deliver all pointers to the view hierarchy.

            mDispatcher.sendDownForAllNotInjectedPointers(event, policyFlags);

        }

    }