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

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

Merge "Delay display DOZE on LS => AOD only if blanking is not needed" into... 

Merge "Delay display DOZE on LS => AOD only if blanking is not needed" into tm-qpr-dev am: 2319065b am: eb0046e3

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



Change-Id: I59e39be034470138ca90db1c71d3c6788f3f10a0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 07a4e2ca eb0046e3

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

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ public class DozeParameters implements 
    }



    private boolean willAnimateFromLockScreenToAod() {

        return getAlwaysOn() && mKeyguardVisible;

        return shouldControlScreenOff() && mKeyguardVisible;

    }



    private boolean getBoolean(String propName, int resId) {