diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-09-19 13:36:54 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-09-19 13:36:54 +0000 |
commit | 68c9d5ba10e3f4611f9d11354fe2ffa9b4a2dc27 (patch) | |
tree | 95f0254bf594454d49a50ab159798692789ab5ae | |
parent | 069fed9b7fa425a9be11606fccac6e62b7d661ba (diff) | |
parent | d5b19b7386cedc6d834cf8458205d023011103ca (diff) |
Merge "Wake-up after auth"
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java index 41c6a7ba7848..2d012c93f42b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java @@ -448,9 +448,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback { } else if (!unlockingAllowed) { return bypass ? MODE_SHOW_BOUNCER : MODE_NONE; } else if (mDozeScrimController.isPulsing()) { - // Let's not wake-up to lock screen when not bypassing, otherwise the notification - // would move as the user tried to tap it. - return bypass ? MODE_WAKE_AND_UNLOCK_PULSING : MODE_NONE; + return bypass ? MODE_WAKE_AND_UNLOCK_PULSING : MODE_ONLY_WAKE; } else { if (bypass) { // Wake-up fading out nicely |