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

Commit 0726843e authored by Svetoslav's avatar Svetoslav
Browse files

Fixing a NPE in accessibility manager service. 

There was a missing null checks as a result of a recent
refactoring.

bug:8185435

Change-Id: I3a1e256b434755b3a27f609dd2b6aeec31aa9a4f
parent fd0fa65e

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

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

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

            if (userState.mUiAutomationService != null

                    && userState.mUiAutomationService.mServiceInterface != null

                    && serviceClient != null

                    && userState.mUiAutomationService != null

                    && userState.mUiAutomationService.mServiceInterface != null

                    && userState.mUiAutomationService.mServiceInterface.asBinder()

                    == serviceClient.asBinder()) {

                userState.mUiAutomationService.binderDied();