commit b88c797713c594404c0c7aef03a8edbe9ae3b3b5
author Tiger Huang <tigerhuang@google.com> Mon Dec 24 07:07:03 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 24 07:07:03 2018 +0000
tree 219aa913ad48917d7007bd1cecfd6820025bc572
parent 79e0da280ce41a8aecb47e289cbe552240ca2b8d
parent fc90c1329bc5b2f4c00604f09f2f92c38436b558

Merge "Update input windows when moving display to top"

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

diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java
index dcade2f0..4e70bbc 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 @@
 
     @Override
     void onChildPositionChanged() {
-        mWmService.updateFocusedWindowLocked(UPDATE_FOCUS_NORMAL, false /* updateInputWindows */);
+        mWmService.updateFocusedWindowLocked(UPDATE_FOCUS_NORMAL,
+                !mWmService.mPerDisplayFocusEnabled /* updateInputWindows */);
     }
 
     DisplayContent getDisplayContent(int displayId) {