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

Commit aa26bf70 authored by Winson Chung's avatar Winson Chung
Browse files

Fix NPE from null window token 

Bug: 424253885
Flag: com.android.window.flags.use_input_reported_focus_for_accessibility
Test: atest AccessibilityWindowManagerTest
Change-Id: Ie9a0bc5eef283d1a5bfef690f01525f57c6801e3
parent 0219d4b6

services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java

+2 −1
Original line number Diff line number Diff line
@@ -704,7 +704,8 @@ public final class AccessibilityWindowsPopulator extends WindowInfosListener { 
            instance.mWindowInfo = windowState != null

                    ? windowState.getWindowInfo() : getWindowInfoForWindowlessWindows(instance);

            if (Flags.useInputReportedFocusForAccessibility()) {

                instance.mWindowInfo.focused = window.equals(topFocusedWindowToken);

                instance.mWindowInfo.focused = window != null

                        && window.equals(topFocusedWindowToken);

            }



            // Compute the transform matrix that will transform bounds from the window