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

Commit eb26fbe4 authored by Svetoslav's avatar Svetoslav Committed by Android (Google) Code Review
Browse files

Merge "Fixing a NPE in accessibility manager service."

parents 6e1a0738 0726843e

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -565,8 +565,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 
            UserState userState = getCurrentUserStateLocked();

            UserState userState = getCurrentUserStateLocked();

            // Automation service is not bound, so pretend it died to perform clean up.

            // Automation service is not bound, so pretend it died to perform clean up.

            if (userState.mUiAutomationService != null

            if (userState.mUiAutomationService != null

                    && userState.mUiAutomationService.mServiceInterface != null

                    && serviceClient != null

                    && serviceClient != null

                    && userState.mUiAutomationService != null

                    && userState.mUiAutomationService.mServiceInterface != null

                    && userState.mUiAutomationService.mServiceInterface.asBinder()

                    && userState.mUiAutomationService.mServiceInterface.asBinder()

                    == serviceClient.asBinder()) {

                    == serviceClient.asBinder()) {

                userState.mUiAutomationService.binderDied();

                userState.mUiAutomationService.binderDied();