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

Commit 6870708b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix NPE in UiAutomationManager" into main

parents 53c30ba0 f28f9e3e

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

+4 −2
Original line number Diff line number Diff line
@@ -274,8 +274,10 @@ class UiAutomationManager { 
            mMainHandler.post(() -> {

                try {

                    final IAccessibilityServiceClient serviceInterface;

                    final UiAutomationService uiAutomationService;

                    synchronized (mLock) {

                        serviceInterface = mServiceInterface;

                        uiAutomationService = mUiAutomationService;

                        if (serviceInterface == null) {

                            mService = null;

                        } else {
@@ -286,8 +288,8 @@ class UiAutomationManager { 
                    // If the serviceInterface is null, the UiAutomation has been shut down on

                    // another thread.

                    if (serviceInterface != null) {

                        if (Flags.addWindowTokenWithoutLock()) {

                            mUiAutomationService.addWindowTokensForAllDisplays();

                        if (Flags.addWindowTokenWithoutLock() && uiAutomationService != null) {

                            uiAutomationService.addWindowTokensForAllDisplays();

                        }

                        if (mTrace.isA11yTracingEnabledForTypes(

                                AccessibilityTrace.FLAGS_ACCESSIBILITY_SERVICE_CLIENT)) {