summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorDanielle Millett <dmillett@google.com>2011-09-15 12:16:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-09-15 12:16:45 -0700
commit86c32c024799e4a7b94ed2422494b5e0f58f336a (patch)
tree6b9ab5731c05e628bddb3bf83827bc5c9ab890de /policy
parent60951ba02753a7b6794f73132b1d5b329b5aac05 (diff)
parent247d8b08b2618c33a4ec1be974829c033c9b909f (diff)
downloadframeworks_base-86c32c024799e4a7b94ed2422494b5e0f58f336a.zip
frameworks_base-86c32c024799e4a7b94ed2422494b5e0f58f336a.tar.gz
frameworks_base-86c32c024799e4a7b94ed2422494b5e0f58f336a.tar.bz2
am 247d8b08: Merge "isPasswordEnabled and isPatternEnabled return true if used as backup method"
* commit '247d8b08b2618c33a4ec1be974829c033c9b909f': isPasswordEnabled and isPatternEnabled return true if used as backup method
Diffstat (limited to 'policy')
-rw-r--r--policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
index 1d311d6..cba1ea1 100644
--- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
+++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
@@ -593,10 +593,6 @@ public class LockPatternKeyguardView extends KeyguardViewBase {
}
private boolean isSecure() {
- // TODO: make this work with SIM and Account cases below.
- boolean usingBiometric = mLockPatternUtils.usingBiometricWeak();
- if (usingBiometric && mLockPatternUtils.isBiometricEnabled())
- return true;
UnlockMode unlockMode = getUnlockMode();
boolean secure = false;
switch (unlockMode) {