diff options
| author | Hiroki Sato <hirokisato@google.com> | 2021-02-18 12:08:58 +0900 |
|---|---|---|
| committer | Hiroki Sato <hirokisato@google.com> | 2021-02-18 03:13:29 +0000 |
| commit | 20fee32accbe4887b51a1f170832c2546e939320 (patch) | |
| tree | f67f39479f58907e02b7c5f780eb4673bc7b4d09 | |
| parent | b8737dac2c10558a05a8df5e6882b110136d72f9 (diff) | |
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
| -rw-r--r-- | services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java index a9e8ea03eab8..675626841d17 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 { |