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

Commit a0148fac authored by Arthur Hung's avatar Arthur Hung Committed by Automerger Merge Worker
Browse files

Merge "Remove focus if no window and current focus is valid" into tm-dev am: f13bfa6c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17504684



Change-Id: Iaf41a143a50a3b4f9a3eec607281d522a3a59b58
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fb4496b9 f13bfa6c

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;

        }