Merge "Removed lockdown check for detectFingerprint"

                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 = mRegistry.getSingleProvider();

            if (provider == null) {

                Slog.w(TAG, "Null provider for detectFingerprint");