Merge "Suppressing Face Unlock during phone call - fix b/7339069" into jb-mr1-dev

Author: Danielle Millett

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

@@ -144,7 +144,7 @@ private void maybeStartBiometricUnlock() {
                     Context.POWER_SERVICE);
             // TODO: Some of these conditions are handled in KeyguardSecurityModel and may not be
             // necessary here.
-            if (monitor.getPhoneState() != TelephonyManager.CALL_STATE_RINGING
+            if (monitor.getPhoneState() == TelephonyManager.CALL_STATE_IDLE
                     && !monitor.getMaxBiometricUnlockAttemptsReached()
                     && !backupIsTimedOut
                     && powerManager.isScreenOn()) {

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

@@ -17,6 +17,7 @@
 
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
+import android.telephony.TelephonyManager;
 
 import com.android.internal.telephony.IccCardConstants;
 import com.android.internal.widget.LockPatternUtils;
@@ -66,7 +67,8 @@ private boolean isBiometricUnlockSuppressed() {
         final boolean backupIsTimedOut = monitor.getFailedUnlockAttempts() >=
                 LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT;
         return monitor.getMaxBiometricUnlockAttemptsReached() || backupIsTimedOut
-                || !monitor.isAlternateUnlockEnabled();
+                || !monitor.isAlternateUnlockEnabled()
+                || monitor.getPhoneState() != TelephonyManager.CALL_STATE_IDLE;
     }
 
     SecurityMode getSecurityMode() {