Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4eab966c authored by Dieter Hsu's avatar Dieter Hsu
Browse files

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
parent 3649bbe4

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

+3 −0
Original line number Diff line number Diff line
@@ -2205,6 +2205,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        }

        synchronized(mLock) {

            final UserState userState = getUserStateLocked(mCurrentUserId);

            if (userState.mServiceToEnableWithShortcut == null) {

                return null;

            }

            return userState.mServiceToEnableWithShortcut.flattenToString();

        }

    }