diff options
| author | Danielle Millett <dmillett@google.com> | 2012-10-12 13:16:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-12 13:16:38 -0700 |
| commit | 8ec3ff8dcc68d246fcaafb98050ec9be4f7ec34a (patch) | |
| tree | 39a2aadfe26c7a50356818c546d96d163985f548 | |
| parent | 67747a68c1ce123a4f32876ecf4ccf66d0793b59 (diff) | |
| parent | d95c659a1d621dfbdd892759419ffc089e248672 (diff) | |
| download | frameworks_base-8ec3ff8dcc68d246fcaafb98050ec9be4f7ec34a.zip frameworks_base-8ec3ff8dcc68d246fcaafb98050ec9be4f7ec34a.tar.gz frameworks_base-8ec3ff8dcc68d246fcaafb98050ec9be4f7ec34a.tar.bz2 | |
Merge "Suppressing Face Unlock during phone call - fix b/7339069" into jb-mr1-dev
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java | 2 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityModel.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java index 4f42071..78fdda3 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java @@ -144,7 +144,7 @@ public class KeyguardFaceUnlockView extends LinearLayout implements KeyguardSecu 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()) { diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityModel.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityModel.java index 8f82b0f..80282c1 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityModel.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityModel.java @@ -17,6 +17,7 @@ package com.android.internal.policy.impl.keyguard; 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 @@ public class KeyguardSecurityModel { 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() { |