Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "rollback" into rvc-dev

Browse Source 
* changes:
  [DO NOT MERGE] Fix NPE from uninitialized object.
  [DO NOT MERGE] TouchExplorer: do not use accessibility action to long click.
This commit is contained in:
Ameer Armaly
2020-06-29 16:32:02 +00:00
committed by Android (Google) Code Review
parent ca6da34ac6 b8544eab9f
commit 724bc71208
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

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

11
services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java
View File

@@ -309,14 +309,9 @@ 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 (mDispatcher.longPressWithTouchEvents(event, policyFlags)) {
if (!mAms.performActionOnAccessibilityFocusedItem( sendHoverExitAndTouchExplorationGestureEndIfNeeded(policyFlags);
AccessibilityNodeInfo.AccessibilityAction.ACTION_LONG_CLICK)) { mState.startDelegating();
Slog.e(LOG_TAG, "ACTION_LONG_CLICK failed.");
if (mDispatcher.longPressWithTouchEvents(event, policyFlags)) {
sendHoverExitAndTouchExplorationGestureEndIfNeeded(policyFlags);
mState.startDelegating();
}
} }
} }