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

Commit 1b4538c7 authored by Steven Ross's avatar Steven Ross Committed by Android Git Automerger
Browse files

am d9a00323: Merge "Don\'t show Face Unlock on initial boot fixes 6396685" into jb-dev

* commit 'd9a00323':
  Don't show Face Unlock on initial boot fixes 6396685
parents 43b32a1c d9a00323
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -117,6 +117,8 @@ public class LockPatternKeyguardView extends KeyguardViewBase {
    private boolean mHasDialog = false;
    //True if this device is currently plugged in
    private boolean mPluggedIn;
    // True the first time lockscreen is showing after boot
    private static boolean sIsFirstAppearanceAfterBoot = true;

    // The music control widget
    private TransportControlView mTransportControlView;
@@ -437,7 +439,8 @@ public class LockPatternKeyguardView extends KeyguardViewBase {
        mUpdateMonitor = updateMonitor;
        mLockPatternUtils = lockPatternUtils;
        mWindowController = controller;
        mSuppressBiometricUnlock = false;
        mSuppressBiometricUnlock = sIsFirstAppearanceAfterBoot;
        sIsFirstAppearanceAfterBoot = false;
        mPluggedIn = mUpdateMonitor.isDevicePluggedIn();
        mScreenOn = ((PowerManager)context.getSystemService(Context.POWER_SERVICE)).isScreenOn();