From e41806e61114791b0f05c31e1ad61db1630d82a4 Mon Sep 17 00:00:00 2001
From: huyuxin <huyuxin@xiaomi.com>
Date: Tue, 26 Oct 2021 10:36:38 +0800
Subject: [PATCH] Fix that AccessibilityServiceConnection#serviceInterface may
 be invalid in the async

Bug: 204104901
Test: Manual

Change-Id: Iab66934872ad6d480eb60d8cd418bd8ab3feda49
Signed-off-by: huyuxin <huyuxin@xiaomi.com>
---
 .../server/accessibility/AccessibilityServiceConnection.java    | 2 +-
 1 file changed, 1 insertion(+), 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 7d75b738d818..0aa50bd1fe93 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java
@@ -407,7 +407,7 @@ class AccessibilityServiceConnection extends AbstractAccessibilityServiceConnect
     @Override
     public void dispatchGesture(int sequence, ParceledListSlice gestureSteps, int displayId) {
         synchronized (mLock) {
-            if (mSecurityPolicy.canPerformGestures(this)) {
+            if (mServiceInterface != null && mSecurityPolicy.canPerformGestures(this)) {
                 MotionEventInjector motionEventInjector =
                         mSystemSupport.getMotionEventInjectorForDisplayLocked(displayId);
                 if (motionEventInjector != null