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

Commit 0d777c06 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: Ib500fc8eca8046050c0acfb6b3796884a21bbafb
parents 7a1d9ef1 15e77132

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

+3 −1
Original line number 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.

     */

    public boolean canControlUnlockedScreenOff() {

        return getAlwaysOn() && mFeatureFlags.useNewLockscreenAnimations();

        return getAlwaysOn()

                && mFeatureFlags.useNewLockscreenAnimations()

                && !getDisplayNeedsBlanking();

    }



    private boolean getBoolean(String propName, int resId) {