diff options
| author | Jim Miller <jaggies@google.com> | 2012-11-05 20:28:09 -0800 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2012-11-05 20:28:09 -0800 |
| commit | 87d0366d9e41a0fb1e20cc021ba391ed92fab385 (patch) | |
| tree | 9deb5be357f24c535789f9b839c316c4774b207b | |
| parent | bb8abae507119612b4168b951354516b0bf7112d (diff) | |
| download | frameworks_base-87d0366d9e41a0fb1e20cc021ba391ed92fab385.zip frameworks_base-87d0366d9e41a0fb1e20cc021ba391ed92fab385.tar.gz frameworks_base-87d0366d9e41a0fb1e20cc021ba391ed92fab385.tar.bz2 | |
Fix NPE caused by applications that try to hide keyguard while it's not showing
Fixes bug 7466360
Change-Id: Idec4c60c2ca2477e49e0f4526ae2357353d4a1e3
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 d0fa81e..3648d99 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(); + } } /** |