Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arthur Hung
2022-03-31 06:33:37 +00:00
committed by Android (Google) Code Review
parent 25319431be c9c163399c
commit f13bfa6c0a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/InputMonitor.java
View File

@@ -414,10 +414,9 @@ final class InputMonitor {
final IBinder focusToken = focus != null ? focus.mInputChannelToken : null; final IBinder focusToken = focus != null ? focus.mInputChannelToken : null;
if (focusToken == null) { if (focusToken == null) {
mInputFocus = null;
// When an app is focused, but its window is not showing yet, remove the input focus // When an app is focused, but its window is not showing yet, remove the input focus
// from the current window. // from the current window.
if (mDisplayContent.mFocusedApp != null) { if (mDisplayContent.mFocusedApp != null && mInputFocus != null) {
ProtoLog.v(WM_DEBUG_FOCUS_LIGHT, "App %s is focused," ProtoLog.v(WM_DEBUG_FOCUS_LIGHT, "App %s is focused,"
+ " but the window is not ready. Start a transaction to remove focus from" + " but the window is not ready. Start a transaction to remove focus from"
+ " the window of non-focused apps.", + " the window of non-focused apps.",
@@ -426,6 +425,7 @@ final class InputMonitor {
"reason=UpdateInputWindows"); "reason=UpdateInputWindows");
mInputTransaction.removeCurrentInputFocus(mDisplayId); mInputTransaction.removeCurrentInputFocus(mDisplayId);
} }
mInputFocus = null;
return; return;
} }