Merge "Suppress msgs from FACE_ERROR_UNABLE_TO_PROCESS" into tm-d1-dev am: 9a14e20379 am: ff498d7e91
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18872709 Change-Id: Iddf032c52cbe232ff23c86487e19510f4b248fa1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1023,7 +1023,14 @@ public class KeyguardIndicationController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (biometricSourceType == BiometricSourceType.FACE
|
if (biometricSourceType == BiometricSourceType.FACE
|
||||||
&& msgId == FaceManager.FACE_ERROR_TIMEOUT) {
|
&& msgId == FaceManager.FACE_ERROR_UNABLE_TO_PROCESS) {
|
||||||
|
// suppress all face UNABLE_TO_PROCESS errors
|
||||||
|
if (DEBUG) {
|
||||||
|
Log.d(TAG, "skip showing FACE_ERROR_UNABLE_TO_PROCESS errString="
|
||||||
|
+ errString);
|
||||||
|
}
|
||||||
|
} else if (biometricSourceType == BiometricSourceType.FACE
|
||||||
|
&& msgId == FaceManager.FACE_ERROR_TIMEOUT) {
|
||||||
if (mKeyguardUpdateMonitor.getCachedIsUnlockWithFingerprintPossible(
|
if (mKeyguardUpdateMonitor.getCachedIsUnlockWithFingerprintPossible(
|
||||||
KeyguardUpdateMonitor.getCurrentUser())) {
|
KeyguardUpdateMonitor.getCurrentUser())) {
|
||||||
// no message if fingerprint is also enrolled
|
// no message if fingerprint is also enrolled
|
||||||
|
|||||||
Reference in New Issue
Block a user