Merge "Add isFaceAuthEnabledForUser checks in KeyguardLiftController" am: 37053a5737 am: 9b6cf8fde7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375617 Change-Id: I03be8a7588ec54d60adb64b0d04612789fe23f27
2020-07-30 04:14:45 +00:00
parent d3843963b0 9b6cf8fde7
commit dc2337c1fe
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
@@ -84,7 +84,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

@@ -95,4 +97,4 @@ class KeyguardLiftController constructor(
            }
        }
    }
-}
+}