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

Commit 1cf43261 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Fix flash of ambient on fp unlock" into oc-dev am: c885c24e am: 1a213362 

am: c2b629c6

Change-Id: Ibf4d518b1292e6768df43d65c71923921448043f
parents 24497573 c2b629c6

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

+6 −0
Original line number Diff line number Diff line
@@ -5217,6 +5217,12 @@ public class StatusBar extends SystemUI implements DemoMode, 
        mDozing = mDozingRequested && mState == StatusBarState.KEYGUARD

                || mFingerprintUnlockController.getMode()

                        == FingerprintUnlockController.MODE_WAKE_AND_UNLOCK_PULSING;

        // When in wake-and-unlock we may not have received a change to mState

        // but we still should not be dozing, manually set to false.

        if (mFingerprintUnlockController.getMode() ==

                FingerprintUnlockController.MODE_WAKE_AND_UNLOCK) {

            mDozing = false;

        }

        mStatusBarWindowManager.setDozing(mDozing);

        mStatusBarKeyguardViewManager.setDozing(mDozing);

        updateDozingState();