Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc2337c1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add isFaceAuthEnabledForUser checks in KeyguardLiftController" am: 37053a57 am: 9b6cf8fd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375617

Change-Id: I03be8a7588ec54d60adb64b0d04612789fe23f27
parents d3843963 9b6cf8fd

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt

+4 −2
Original line number Diff line number Diff line
@@ -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