Merge "Add isFaceAuthEnabledForUser checks in KeyguardLiftController"

2020-07-30 03:36:40 +00:00
parent 9352fceedb d54cd01f23
commit 37053a5737
1 changed files with 4 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt
@@ -73,7 +73,9 @@ class KeyguardLiftController constructor(
        val onKeyguard = keyguardUpdateMonitor.isKeyguardVisible &&
                !statusBarStateController.isDozing

-        val shouldListen = onKeyguard || bouncerVisible
+        val userId = KeyguardUpdateMonitor.getCurrentUser()
+        val isFaceEnabled = keyguardUpdateMonitor.isFaceAuthEnabledForUser(userId)
+        val shouldListen = (onKeyguard || bouncerVisible) && isFaceEnabled
        if (shouldListen != isListening) {
            isListening = shouldListen

@@ -84,4 +86,4 @@ class KeyguardLiftController constructor(
            }
        }
    }
-}
+}