Merge "Add isFaceAuthEnabledForUser checks in KeyguardLiftController" am: 37053a5737
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375617 Change-Id: I81b18b9117f929e3f6d3387c982cf1dc5b83acd3
This commit is contained in:
@@ -73,7 +73,9 @@ class KeyguardLiftController constructor(
|
|||||||
val onKeyguard = keyguardUpdateMonitor.isKeyguardVisible &&
|
val onKeyguard = keyguardUpdateMonitor.isKeyguardVisible &&
|
||||||
!statusBarStateController.isDozing
|
!statusBarStateController.isDozing
|
||||||
|
|
||||||
val shouldListen = onKeyguard || bouncerVisible
|
val userId = KeyguardUpdateMonitor.getCurrentUser()
|
||||||
|
val isFaceEnabled = keyguardUpdateMonitor.isFaceAuthEnabledForUser(userId)
|
||||||
|
val shouldListen = (onKeyguard || bouncerVisible) && isFaceEnabled
|
||||||
if (shouldListen != isListening) {
|
if (shouldListen != isListening) {
|
||||||
isListening = shouldListen
|
isListening = shouldListen
|
||||||
|
|
||||||
@@ -84,4 +86,4 @@ class KeyguardLiftController constructor(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user