am 16ddf343: am 8eb3048a: am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing

* commit '16ddf343a61dfc93ff9a6fc4721b8fb16010da48': Fix NPE caused by applications that try to hide keyguard while it's not showing
2012-11-07 15:06:33 -08:00
parent 63121bd6c1 16ddf343a6
commit d3bd6eb8b2
1 changed files with 3 additions and 1 deletions
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
@@ -881,7 +881,9 @@ public class KeyguardViewMediator {
     * Dismiss the keyguard through the security layers.
     */
    public void dismiss() {
-        mKeyguardViewManager.dismiss();
+        if (mShowing && !mHidden) {
+            mKeyguardViewManager.dismiss();
+        }
    }

    /**