Merge "Only suppressing FUL on boot if selected fixes b/7338965" into jb-mr1-lockscreen-dev

            mSystemReady = true;

            mSystemReady = true;

            mUpdateMonitor.registerCallback(mUpdateCallback);

            mUpdateMonitor.registerCallback(mUpdateCallback);

            // Disable alternate unlock right after boot until things have settled.

            // Suppress biometric unlock right after boot until things have settled if it is the

            // selected security method, otherwise unsuppress it.  It must be unsuppressed if it is

            // not the selected security method for the following reason:  if the user starts

            // without a screen lock selected, the biometric unlock would be suppressed the first

            // time they try to use it.

            //

            // Note that the biometric unlock will still not show if it is not the selected method.

            // Calling setAlternateUnlockEnabled(true) simply says don't suppress it if it is the

            // selected method.

            if (mLockPatternUtils.usingBiometricWeak()

                    && mLockPatternUtils.isBiometricWeakInstalled()) {

                if (DEBUG) Log.d(TAG, "suppressing biometric unlock during boot");

                mUpdateMonitor.setAlternateUnlockEnabled(false);

                mUpdateMonitor.setAlternateUnlockEnabled(false);

            } else {

                mUpdateMonitor.setAlternateUnlockEnabled(true);

            }

            doKeyguardLocked();

            doKeyguardLocked();

        }

        }