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

Commit e927ca91 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE of A11yManagerService#getAccessibilityShortcutService"

parents e7a1ac48 4eab966c

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();

        }

    }