summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Ross <stross@google.com>2012-09-27 10:17:16 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-27 10:17:18 -0700
commit9a4a0376a78f9b3bcfe6374660fbe7c28797b36a (patch)
tree8fef7ef1624484f03897718009f521a6575d47e4
parent6c805cb53d2c03056722b7ae672bb94c9f71ce71 (diff)
parentfbb9c6197f4c9dd2583590559502e3b0600867d8 (diff)
downloadframeworks_base-9a4a0376a78f9b3bcfe6374660fbe7c28797b36a.zip
frameworks_base-9a4a0376a78f9b3bcfe6374660fbe7c28797b36a.tar.gz
frameworks_base-9a4a0376a78f9b3bcfe6374660fbe7c28797b36a.tar.bz2
Merge "Stop FaceUnlock when detached from window fixes b/7222226" into jb-mr1-dev
-rw-r--r--policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java8
1 files changed, 8 insertions, 0 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 062c1be..5922810 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java
@@ -69,6 +69,14 @@ public class KeyguardFaceUnlockView extends LinearLayout implements KeyguardSecu
}
@Override
+ public void onDetachedFromWindow() {
+ if (mBiometricUnlock != null) {
+ mBiometricUnlock.hide();
+ mBiometricUnlock.stop();
+ }
+ }
+
+ @Override
public void onPause() {
if (mBiometricUnlock != null) {
mBiometricUnlock.hide();