am ebb0b118: am 98a53594: am 0e767b29: am 5c533884: Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev
* commit 'ebb0b118f18b97e18bb69c0fe12f252adcf2557c':
Make dismissKeyguardLw use KeyguardViewMediator.dismiss().
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index ea47552..3738a2f 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -3899,14 +3899,18 @@
}
public void dismissKeyguardLw() {
- if (mKeyguardMediator.isDismissable()) {
- if (mKeyguardMediator.isShowing()) {
- mHandler.post(new Runnable() {
- public void run() {
+ if (mKeyguardMediator.isShowing()) {
+ mHandler.post(new Runnable() {
+ public void run() {
+ if (mKeyguardMediator.isDismissable()) {
+ // Can we just finish the keyguard straight away?
mKeyguardMediator.keyguardDone(false, true);
+ } else {
+ // ask the keyguard to prompt the user to authenticate if necessary
+ mKeyguardMediator.dismiss();
}
- });
- }
+ }
+ });
}
}