From 4b8fac016d11d7a4a960917e66a2138d48016129 Mon Sep 17 00:00:00 2001
From: Ameer Armaly <aarmaly@google.com>
Date: Fri, 26 Jun 2020 10:19:40 -0700
Subject: [PATCH 1/2] [DO NOT MERGE] TouchExplorer: do not use accessibility
 action to long click.

This got overlooked during the initial revert.
Bug: 159941636
Test: atest TouchExplorerTest

Change-Id: I257852d69e299c7f0302d15b23d96f302f922005
---
 .../server/accessibility/gestures/TouchExplorer.java  | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java b/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java
index 373d47ed366b7..6f2e6263b9375 100644
--- a/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java
+++ b/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java
@@ -309,14 +309,9 @@ 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();
-            }
+        if (mDispatcher.longPressWithTouchEvents(event, policyFlags)) {
+            sendHoverExitAndTouchExplorationGestureEndIfNeeded(policyFlags);
+            mState.startDelegating();
         }
     }
 

From b8544eab9f31d8b3a0d57c69c91f70463cc07c0c Mon Sep 17 00:00:00 2001
From: Ameer Armaly <aarmaly@google.com>
Date: Fri, 26 Jun 2020 10:46:35 -0700
Subject: [PATCH 2/2] [DO NOT MERGE] Fix NPE from uninitialized object.

Bug: 159941636
Test: atest TouchExplorerTest
Change-Id: I691bf74ad35bb1af2776e3e6c7212dfbac9fa9fe
---
 .../server/accessibility/AccessibilityManagerService.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index d2b1bd1a60089..499a2711d8e6b 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -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() {