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

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

Merge "Fix AOD2 notifications not waking up the device if the screen off... 

Merge "Fix AOD2 notifications not waking up the device if the screen off animation played." into sc-dev am: f1c4d4e1 am: 5f4485f1

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

Change-Id: I09be00f0723809deab2035f367c43703cb81fb43
parents 944fbaae 5f4485f1

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

+1 −3
Original line number Diff line number Diff line
@@ -1473,9 +1473,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
     * @param why the reason for the wake up

     */

    public void wakeUpIfDozing(long time, View where, String why) {

        if (mDozing && !(mKeyguardViewMediator.isAnimatingScreenOff()

                || mUnlockedScreenOffAnimationController

                    .isScreenOffLightRevealAnimationPlaying())) {

        if (mDozing && !mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()) {

            mPowerManager.wakeUp(

                    time, PowerManager.WAKE_REASON_GESTURE, "com.android.systemui:" + why);

            mWakeUpComingFromTouch = true;