Merge "FUL being unsuppressed when screen turns off fixes b/7453702" into jb-mr1-lockscreen-dev

Author: Brian Colonna

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

@@ -421,8 +421,8 @@ private void reportFailedUnlockAttempt() {
     void showPrimarySecurityScreen(boolean turningOff) {
         SecurityMode securityMode = mSecurityModel.getSecurityMode();
         if (DEBUG) Log.v(TAG, "showPrimarySecurityScreen(turningOff=" + turningOff + ")");
-        if (!turningOff && KeyguardUpdateMonitor.getInstance(mContext).isAlternateUnlockEnabled()
-                && !KeyguardUpdateMonitor.getInstance(mContext).getIsFirstBoot()) {
+        if (!turningOff &&
+                KeyguardUpdateMonitor.getInstance(mContext).isAlternateUnlockEnabled()) {
             // If we're not turning off, then allow biometric alternate.
             // We'll reload it when the device comes back on.
             securityMode = mSecurityModel.getAlternateFor(securityMode);
@@ -498,7 +498,6 @@ private void showNextSecurityScreenOrFinish(boolean authenticated) {
             // If the alternate unlock was suppressed, it can now be safely
             // enabled because the user has left keyguard.
             KeyguardUpdateMonitor.getInstance(mContext).setAlternateUnlockEnabled(true);
-            KeyguardUpdateMonitor.getInstance(mContext).setIsFirstBoot(false);
 
             // If there's a pending runnable because the user interacted with a widget
             // and we're leaving keyguard, then run it.
@@ -710,6 +709,9 @@ public void onScreenTurnedOn() {
     @Override
     public void onScreenTurnedOff() {
         if (DEBUG) Log.d(TAG, "screen off, instance " + Integer.toHexString(hashCode()));
+        // Once the screen turns off, we no longer consider this to be first boot and we want the
+        // biometric unlock to start next time keyguard is shown.
+        KeyguardUpdateMonitor.getInstance(mContext).setAlternateUnlockEnabled(true);
         saveStickyWidgetIndex();
         showPrimarySecurityScreen(true);
         getSecurityView(mCurrentSecuritySelection).onPause();

policy/src/com/android/internal/policy/impl/keyguard/KeyguardUpdateMonitor.java

@@ -200,7 +200,6 @@ public void onReceive(Context context, Intent intent) {
             }
         }
     };
-    private boolean mIsFirstBoot;
 
     /**
      * When we receive a
@@ -778,12 +777,4 @@ public static boolean isSimPinSecure(IccCardConstants.State state) {
                 || simState == IccCardConstants.State.PUK_REQUIRED
                 || simState == IccCardConstants.State.PERM_DISABLED);
     }
-
-    public void setIsFirstBoot(boolean b) {
-        mIsFirstBoot = b;
-    }
-    
-    public boolean getIsFirstBoot() {
-        return mIsFirstBoot;
-    }
 }

policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java

@@ -522,7 +522,6 @@ public void onSystemReady() {
 
             // Disable alternate unlock right after boot until things have settled.
             mUpdateMonitor.setAlternateUnlockEnabled(false);
-            mUpdateMonitor.setIsFirstBoot(true);
 
             doKeyguardLocked();
         }