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

Commit c9c16339 authored by Arthur Hung's avatar Arthur Hung
Browse files

Remove focus if no window and current focus is valid 

To prevent the event log report many requesting to set the focus to
null window even the current focus has been cleared.

Bug: 227445061
Test: manual
Change-Id: Ia6b6ff9a50824944788968921274750ad43a4bc8
parent 56c61994

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

+2 −2
Original line number Diff line number Diff line
@@ -414,10 +414,9 @@ final class InputMonitor { 


        final IBinder focusToken = focus != null ? focus.mInputChannelToken : null;

        if (focusToken == null) {

            mInputFocus = null;

            // When an app is focused, but its window is not showing yet, remove the input focus

            // from the current window.

            if (mDisplayContent.mFocusedApp != null) {

            if (mDisplayContent.mFocusedApp != null && mInputFocus != null) {

                ProtoLog.v(WM_DEBUG_FOCUS_LIGHT, "App %s is focused,"

                        + " but the window is not ready. Start a transaction to remove focus from"

                        + " the window of non-focused apps.",
@@ -426,6 +425,7 @@ final class InputMonitor { 
                        "reason=UpdateInputWindows");

                mInputTransaction.removeCurrentInputFocus(mDisplayId);

            }

            mInputFocus = null;

            return;

        }