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

Commit e0090307 authored by Ameer Armaly's avatar Ameer Armaly Committed by Automerger Merge Worker
Browse files

[DO NOT MERGE] Fix NPE from uninitialized object. am: b8544eab 

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

Change-Id: Id4db742e6500649a2d037eee5ddf48eea4527211
parents f810ef1f b8544eab

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

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

    //TODO: Remove this hack

    private boolean mInitialized;

    private boolean mInitialized;





    private Point mTempPoint;

    private Point mTempPoint = new Point();

    private boolean mIsAccessibilityButtonShown;

    private boolean mIsAccessibilityButtonShown;





    private AccessibilityUserState getCurrentUserStateLocked() {

    private AccessibilityUserState getCurrentUserStateLocked() {

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

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




    @Override

    @Override

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

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

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

            sendHoverExitAndTouchExplorationGestureEndIfNeeded(policyFlags);

            sendHoverExitAndTouchExplorationGestureEndIfNeeded(policyFlags);

            mState.startDelegating();

            mState.startDelegating();

        }

        }

    }

    }

    }





    @Override

    @Override

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

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