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

Commit 4c1289ff authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ia8054b648e091db7901dd0946a9ae36648281110
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f37924a 13ea38e0

services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java

+0 −7
Original line number Diff line number Diff line
@@ -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");