commit 4eab966c0a5774f7777a38d228bb2bcc5638571e
author Dieter Hsu <dieterhsu@google.com> Thu Sep 19 12:56:49 2019 +0800
committer Dieter Hsu <dieterhsu@google.com> Thu Sep 19 12:56:49 2019 +0800
tree 8013de9c84b88c9880d26dbe2b869d9cb74f84dc
parent 3649bbe412478ebf3e8f5e6ae9301e66f6b04d1c

Fix NPE of A11yManagerService#getAccessibilityShortcutService

Add a null check before flattening the component name.

Bug: 132345003
Test: Null check. Existing unit tests still pass.
Change-Id: I1df04f97d5cad1cecc503b068e3036913aa46811

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

diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index ba4d89c..1f11059 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -2205,6 +2205,9 @@
         }
         synchronized(mLock) {
             final UserState userState = getUserStateLocked(mCurrentUserId);
+            if (userState.mServiceToEnableWithShortcut == null) {
+                return null;
+            }
             return userState.mServiceToEnableWithShortcut.flattenToString();
         }
     }