summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Ross <stross@google.com>2012-10-16 17:44:52 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-16 17:44:53 -0700
commite4728b15cba1cebb8d9f60d146d95ff58a945ad8 (patch)
treeecc46b06c4305f3bf054fbab6c29e020b145a553
parent69b0c974b5abb38a4443410cf09f7d5f28cf2c7f (diff)
parent9a9f4ce1e2522f020b72a08161c1c3d244dd5c68 (diff)
downloadframeworks_base-e4728b15cba1cebb8d9f60d146d95ff58a945ad8.zip
frameworks_base-e4728b15cba1cebb8d9f60d146d95ff58a945ad8.tar.gz
frameworks_base-e4728b15cba1cebb8d9f60d146d95ff58a945ad8.tar.bz2
Merge "Stopping Face Unlock immediately on detaching from window fixes 7338808" into jb-mr1-dev
-rw-r--r--policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java2
1 files changed, 1 insertions, 1 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 78fdda3..04ab871 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java
@@ -75,7 +75,7 @@ public class KeyguardFaceUnlockView extends LinearLayout implements KeyguardSecu
public void onDetachedFromWindow() {
if (DEBUG) Log.d(TAG, "onDetachedFromWindow()");
if (mBiometricUnlock != null) {
- mBiometricUnlock.stopAndShowBackup();
+ mBiometricUnlock.stop();
}
}