diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java index b4fe900e5320..02202cf26c38 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java @@ -166,14 +166,6 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback { } mHandler.postDelayed(mReleaseFingerprintWakeLockRunnable, FINGERPRINT_WAKELOCK_TIMEOUT_MS); - - if (pulsingOrAod()) { - // If we are waking the device up while we are pulsing the clock and the - // notifications would light up first, creating an unpleasant animation. - // Defer changing the screen brightness by forcing doze brightness on our window - // until the clock and the notifications are faded out. - mStatusBarWindowManager.setForceDozeBrightness(true); - } } Trace.endSection(); } @@ -194,6 +186,13 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback { } boolean wasDeviceInteractive = mUpdateMonitor.isDeviceInteractive(); mMode = calculateMode(); + if (mMode == MODE_WAKE_AND_UNLOCK_PULSING && pulsingOrAod()) { + // If we are waking the device up while we are pulsing the clock and the + // notifications would light up first, creating an unpleasant animation. + // Defer changing the screen brightness by forcing doze brightness on our window + // until the clock and the notifications are faded out. + mStatusBarWindowManager.setForceDozeBrightness(true); + } if (!wasDeviceInteractive) { if (DEBUG_FP_WAKELOCK) { Log.i(TAG, "fp wakelock: Authenticated, waking up..."); @@ -244,9 +243,6 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback { case MODE_NONE: break; } - if (mMode != MODE_WAKE_AND_UNLOCK_PULSING) { - mStatusBarWindowManager.setForceDozeBrightness(false); - } mStatusBar.notifyFpAuthModeChanged(); Trace.endSection(); } |