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

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

Merge "Fix NPE from null window token" into main

parents 748f1058 aa26bf70

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