summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tiger Huang <tigerhuang@google.com> 2018-12-20 18:53:47 +0800
committer Tiger Huang <tigerhuang@google.com> 2018-12-24 04:00:27 +0000
commitfc90c1329bc5b2f4c00604f09f2f92c38436b558 (patch)
tree70be8d2b41adf91b1a6f3ac59fad23a4de82833d
parent7f8c5ac3f56faf835240f94e3d204635757248e1 (diff)
Update input windows when moving display to top
If per-display focus is not enabled, moving display to top may cause the focus change. We need to update input windows to keep input dispatcher up-to-date. Change-Id: I7934dd76395f249c3b4c1d30f15d15436a1cebf0 Fix: 121303595 Fix: 121343696 Test: atest ActivityManagerDisplayLockedKeyguardTests
-rw-r--r--services/core/java/com/android/server/wm/RootWindowContainer.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java
index dcade2f012db..4e70bbc277d8 100644
--- a/services/core/java/com/android/server/wm/RootWindowContainer.java
+++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -198,7 +198,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
@Override
void onChildPositionChanged() {
- mWmService.updateFocusedWindowLocked(UPDATE_FOCUS_NORMAL, false /* updateInputWindows */);
+ mWmService.updateFocusedWindowLocked(UPDATE_FOCUS_NORMAL,
+ !mWmService.mPerDisplayFocusEnabled /* updateInputWindows */);
}
DisplayContent getDisplayContent(int displayId) {