Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8661d451 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I8578bb6c8d40c89dda54afa2929ef45be9856707
parents bd86f728 15e77132

packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -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) {