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

Commit 724bc712 authored by Ameer Armaly's avatar Ameer Armaly Committed by Android (Google) Code Review
Browse files

Merge changes from topic "rollback" into rvc-dev 

* changes:
  [DO NOT MERGE] Fix NPE from uninitialized object.
  [DO NOT MERGE] TouchExplorer: do not use accessibility action to long click.
parents ca6da34a b8544eab

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
    //TODO: Remove this hack

    private boolean mInitialized;



    private Point mTempPoint;

    private Point mTempPoint = new Point();

    private boolean mIsAccessibilityButtonShown;



    private AccessibilityUserState getCurrentUserStateLocked() {

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

+3 −8
Original line number Diff line number Diff line
@@ -309,16 +309,11 @@ public class TouchExplorer extends BaseEventStreamTransformation 


    @Override

    public void onDoubleTapAndHold(MotionEvent event, MotionEvent rawEvent, int policyFlags) {

        // Try to use the standard accessibility API to long click

        if (!mAms.performActionOnAccessibilityFocusedItem(

                AccessibilityNodeInfo.AccessibilityAction.ACTION_LONG_CLICK)) {

            Slog.e(LOG_TAG, "ACTION_LONG_CLICK failed.");

        if (mDispatcher.longPressWithTouchEvents(event, policyFlags)) {

            sendHoverExitAndTouchExplorationGestureEndIfNeeded(policyFlags);

            mState.startDelegating();

        }

    }

    }



    @Override

    public boolean onDoubleTap(MotionEvent event, MotionEvent rawEvent, int policyFlags) {