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

Commit d2aa92e0 authored by Tiger Huang's avatar Tiger Huang
Browse files

Make native input focus up to date 

Previously, mWindowPlacerLocked.performSurfacePlacement() was called
after updateFocusedWindowLocked(), so the input windows would get
updated in relayoutWindow() after updating focus window.

But now, there is no surface placement after updating focus window,
so this makes it update the input windows just within
updateFocusedWindowLocked().

Bug: 112880070
Test: atest CtsWindowManagerDeviceTestCases:LayoutTests
Change-Id: Ib7077b9567f3d5e6b62c2c4f4db51d569c1fce79
parent a2e28a4b

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

+1 −4
Original line number Diff line number Diff line
@@ -2092,12 +2092,9 @@ public class WindowManagerService extends IWindowManager.Stub 
            }



            if (focusMayChange) {

                //System.out.println("Focus may change: " + win.mAttrs.getTitle());

                if (updateFocusedWindowLocked(UPDATE_FOCUS_WILL_PLACE_SURFACES,

                        false /*updateInputWindows*/)) {

                if (updateFocusedWindowLocked(UPDATE_FOCUS_NORMAL, true /*updateInputWindows*/)) {

                    imMayMove = false;

                }

                //System.out.println("Relayout " + win + ": focus=" + mCurrentFocus);

            }



            // updateFocusedWindowLocked() already assigned layers so we only need to