Merge "Suppress msgs from FACE_ERROR_UNABLE_TO_PROCESS" into tm-d1-dev am: 9a14e20379 am: ff498d7e91 am: e719ccce0b

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

Change-Id: Ib596b2acc42c7d0f5306c72745017521991af0d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Beverly Tai
2022-06-13 21:26:16 +00:00
committed by Automerger Merge Worker

View File

@@ -1023,7 +1023,14 @@ public class KeyguardIndicationController {
}
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(
KeyguardUpdateMonitor.getCurrentUser())) {
// no message if fingerprint is also enrolled