From 20fee32accbe4887b51a1f170832c2546e939320 Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hirokisato@google.com>
Date: Thu, 18 Feb 2021 12:08:58 +0900
Subject: [PATCH] Fix NullPointerException in
 AccessibilityServiceConnection#dispatchGesture

Previous change [1] accidentally deleted null check.
This change restores it.

[1] I8a1e4884d1283705d409ed38e35047ec2dcd89f0

Bug: 180554945
Bug: 180056331
Test: CtsAccessibilityServiceTestCases
Change-Id: Ia32ce1da41bcf3fda1476dd8a49ba363d1ad850f
---
 .../server/accessibility/AccessibilityServiceConnection.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java
index a9e8ea03eab8f..675626841d178 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java
@@ -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 {