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

Commit cf5b268a 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

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

Change-Id: Id460dfb5327f5e7632e05fab64fcd391a01cf53c
parents a5df8afc f1c4d4e1

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;