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

This commit is contained in:
Josh Tsuji
2021-08-04 15:20:58 +00:00
committed by Android (Google) Code Review

View File

@@ -231,7 +231,9 @@ public class DozeParameters implements TunerService.Tunable,
* possible if AOD isn't even enabled or if the flag is disabled. * possible if AOD isn't even enabled or if the flag is disabled.
*/ */
public boolean canControlUnlockedScreenOff() { public boolean canControlUnlockedScreenOff() {
return getAlwaysOn() && mFeatureFlags.useNewLockscreenAnimations(); return getAlwaysOn()
&& mFeatureFlags.useNewLockscreenAnimations()
&& !getDisplayNeedsBlanking();
} }
private boolean getBoolean(String propName, int resId) { private boolean getBoolean(String propName, int resId) {