From 87d0366d9e41a0fb1e20cc021ba391ed92fab385 Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Mon, 5 Nov 2012 20:28:09 -0800
Subject: [PATCH] Fix NPE caused by applications that try to hide keyguard
 while it's not showing

Fixes bug 7466360

Change-Id: Idec4c60c2ca2477e49e0f4526ae2357353d4a1e3
---
 .../internal/policy/impl/keyguard/KeyguardViewMediator.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
index d0fa81e9b5ded..3648d99abbb41 100644
--- 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();
+        }
     }
 
     /**