Merge "Disable unlocked screen off if the display needs blanking." into sc-dev

2021-08-04 15:20:58 +00:00
parent 8646abf978 56a5f52131
commit 15e77132cc
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
@@ -231,7 +231,9 @@ public class DozeParameters implements TunerService.Tunable,
     * possible if AOD isn't even enabled or if the flag is disabled.
     */
    public boolean canControlUnlockedScreenOff() {
-        return getAlwaysOn() && mFeatureFlags.useNewLockscreenAnimations();
+        return getAlwaysOn()
+                && mFeatureFlags.useNewLockscreenAnimations()
+                && !getDisplayNeedsBlanking();
    }

    private boolean getBoolean(String propName, int resId) {