Merge "Fix NullPointerException in AccessibilityServiceConnection#dispatchGesture" into sc-dev am: e463a7d440

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I13b3d63b862594a01d4be8dd1cefa4d30d5c3479
This commit is contained in:
TreeHugger Robot
2021-02-22 03:33:18 +00:00
committed by Automerger Merge Worker

View File

@@ -376,7 +376,8 @@ class AccessibilityServiceConnection extends AbstractAccessibilityServiceConnect
if (mSecurityPolicy.canPerformGestures(this)) {
MotionEventInjector motionEventInjector =
mSystemSupport.getMotionEventInjectorForDisplayLocked(displayId);
if (mWindowManagerService.isTouchOrFaketouchDevice()) {
if (motionEventInjector != null
&& mWindowManagerService.isTouchOrFaketouchDevice()) {
motionEventInjector.injectEvents(
gestureSteps.getList(), mServiceInterface, sequence, displayId);
} else {