summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wei Sheng Shih <wilsonshih@google.com> 2020-07-06 02:04:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-06 02:04:26 +0000
commit70ba1be290ef18b42280d610c43b43ad4e845169 (patch)
tree3d7dd2015dc947009b5df2238dff68f66a8db0aa
parentaf28c0eedc66824e349be1032296e0c39e5b80af (diff)
parenta3a29967b19eeeaa43ea7dc8928dcfc475d0a38c (diff)
Merge "Remove redundant checks that stop updating systemUI when entering dream" into rvc-dev am: a3a29967b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12066142 Change-Id: I4c4e71191c09c4ae184666f159466813fbcdc0f0
-rw-r--r--services/core/java/com/android/server/wm/DisplayPolicy.java10
1 files changed, 0 insertions, 10 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index 72b014cab2bb..68051ab59599 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -3300,16 +3300,6 @@ public class DisplayPolicy {
}
}
final WindowState win = winCandidate;
- if (win.getAttrs().type == TYPE_NOTIFICATION_SHADE && isKeyguardShowing()
- && isKeyguardOccluded()) {
- // We are updating at a point where the keyguard has gotten
- // focus, but we were last in a state where the top window is
- // hiding it. This is probably because the keyguard as been
- // shown while the top window was displayed, so we want to ignore
- // it here because this is just a very transient change and it
- // will quickly lose focus once it correctly gets hidden.
- return 0;
- }
mDisplayContent.getInsetsPolicy().updateBarControlTarget(win);