Merge "Remove redundant checks that stop updating systemUI when entering dream" into rvc-dev am: a3a29967b1 am: 57319f5921

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

Change-Id: I8865ed1137917b470c3d9ff00925fae408901553
This commit is contained in:
Wei Sheng Shih
2020-07-06 02:20:15 +00:00
committed by Automerger Merge Worker

View File

@@ -3300,16 +3300,6 @@ public class DisplayPolicy {
} }
} }
final WindowState win = winCandidate; 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); mDisplayContent.getInsetsPolicy().updateBarControlTarget(win);