commit 52c3e1b2244a645d7a5bec9a777bf65dac879e77
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 29 05:20:21 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 29 05:20:21 2021 +0000
tree 099236c6d85f08270f9377da222f48aca239365b
parent 4a866e86b5d37967a4e96e40005efd831ff1141b
parent 8a39104e92c6a6df501d565498810aaa17f16378

Merge "Fix that AccessibilityServiceConnection#serviceInterface may be invalid in the async" am: 700fb9ebeb am: bf6cc67976 am: 481964bf2c am: 8a39104e92

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

Change-Id: Id1e48b5fd14aa2371bfeb43f938b611824308a39

services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java

diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java
index e9f5870..bcb3413 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java
@@ -406,7 +406,7 @@
     @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 (wmTracingEnabled()) {