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

Commit b40e48cd authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Automerger Merge Worker
Browse files

Merge "Delay awaken from Dream to avoid wallpaper flickering." into tm-qpr-dev... 

Merge "Delay awaken from Dream to avoid wallpaper flickering." into tm-qpr-dev am: ec576c7a am: 3f95cc8d

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



Change-Id: Ic4b34fcda152129f2556c6ffe42e44de65bb17c0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 25836199 3f95cc8d

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+11 −4
Original line number Diff line number Diff line
@@ -2377,10 +2377,10 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
    private void handleHide() {

        Trace.beginSection("KeyguardViewMediator#handleHide");



        // It's possible that the device was unlocked in a dream state. It's time to wake up.

        if (mAodShowing || mDreamOverlayShowing) {

            PowerManager pm = mContext.getSystemService(PowerManager.class);

            pm.wakeUp(SystemClock.uptimeMillis(), PowerManager.WAKE_REASON_GESTURE,

        // It's possible that the device was unlocked (via BOUNCER) while dozing. It's time to

        // wake up.

        if (mAodShowing) {

            mPM.wakeUp(SystemClock.uptimeMillis(), PowerManager.WAKE_REASON_GESTURE,

                    "com.android.systemui:BOUNCER_DOZING");

        }
@@ -2409,6 +2409,13 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
                            null /* nonApps */, null /* finishedCallback */);

                });

            }



            // It's possible that the device was unlocked (via BOUNCER or Fingerprint) while

            // dreaming. It's time to wake up.

            if (mDreamOverlayShowing) {

                mPM.wakeUp(SystemClock.uptimeMillis(), PowerManager.WAKE_REASON_GESTURE,

                        "com.android.systemui:UNLOCK_DREAMING");

            }

        }

        Trace.endSection();

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -512,7 +512,8 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp 
                    Trace.beginSection("MODE_WAKE_AND_UNLOCK");

                } else {

                    Trace.beginSection("MODE_WAKE_AND_UNLOCK_FROM_DREAM");

                    mUpdateMonitor.awakenFromDream();

                    // Don't call awaken from Dream here. In order to avoid flickering, wait until

                    // later to awaken.

                }

                mNotificationShadeWindowController.setNotificationShadeFocusable(false);

                mKeyguardViewMediator.onWakeAndUnlocking();