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

* commit '8eb3048acc2a3fddf0d6acfb43e69696672ae706':
  Fix NPE caused by applications that try to hide keyguard while it's not showing
This commit is contained in:
Jim Miller
2012-11-06 12:48:22 -08:00
committed by Android Git Automerger

View File

@@ -881,7 +881,9 @@ public class KeyguardViewMediator {
* Dismiss the keyguard through the security layers. * Dismiss the keyguard through the security layers.
*/ */
public void dismiss() { public void dismiss() {
mKeyguardViewManager.dismiss(); if (mShowing && !mHidden) {
mKeyguardViewManager.dismiss();
}
} }
/** /**