Merge "Removed lockdown check for detectFingerprint" into tm-qpr-dev am: 13ea38e020

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

Change-Id: Ia8054b648e091db7901dd0946a9ae36648281110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Beverly Tai
2022-11-30 17:28:21 +00:00
committed by Automerger Merge Worker

View File

@@ -452,13 +452,6 @@ public class FingerprintService extends SystemService {
return -1;
}
if (!Utils.isUserEncryptedOrLockdown(mLockPatternUtils, userId)) {
// If this happens, something in KeyguardUpdateMonitor is wrong. This should only
// ever be invoked when the user is encrypted or lockdown.
Slog.e(TAG, "detectFingerprint invoked when user is not encrypted or lockdown");
return -1;
}
final Pair<Integer, ServiceProvider> provider = getSingleProvider();
if (provider == null) {
Slog.w(TAG, "Null provider for detectFingerprint");