commit 4108a9b46cb385ed285f80df408a913922e748c2
author Lucas Dupin <dupin@google.com> Tue May 28 20:41:51 2019 -0700
committer Lucas Dupin <dupin@google.com> Tue May 28 20:44:21 2019 -0700
tree e1a3cbb337ec14055b5fd657f45f023b0b8c1e59
parent 0c2d505dfbbeaaa90420921fb56f943b0c4b6765

Do not wake up in MODE_NONE

Test: pulse, face auth
Fixes: 133525174
Change-Id: Idcf927be54044a47ce981230398dabe3a366158a

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

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 6159f6c..d677952 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java
@@ -23,7 +23,6 @@
 import android.os.PowerManager;
 import android.os.SystemClock;
 import android.os.Trace;
-import android.provider.Settings;
 import android.util.Log;
 
 import com.android.internal.annotations.VisibleForTesting;
@@ -34,7 +33,6 @@
 import com.android.keyguard.KeyguardUpdateMonitor;
 import com.android.keyguard.KeyguardUpdateMonitorCallback;
 import com.android.systemui.Dependency;
-import com.android.systemui.R;
 import com.android.systemui.keyguard.KeyguardViewMediator;
 import com.android.systemui.keyguard.ScreenLifecycle;
 import com.android.systemui.keyguard.WakefulnessLifecycle;
@@ -272,7 +270,7 @@
             Trace.endSection();
         };
 
-        if (!delayWakeUp) {
+        if (!delayWakeUp && mMode != MODE_NONE) {
             wakeUp.run();
         }
         switch (mMode) {