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

* commit '87d0366d9e41a0fb1e20cc021ba391ed92fab385':
  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:44:07 -08:00
committed by Android Git Automerger

View File

@@ -881,8 +881,10 @@ public class KeyguardViewMediator {
* Dismiss the keyguard through the security layers. * Dismiss the keyguard through the security layers.
*/ */
public void dismiss() { public void dismiss() {
if (mShowing && !mHidden) {
mKeyguardViewManager.dismiss(); mKeyguardViewManager.dismiss();
} }
}
/** /**
* Send message to keyguard telling it to reset its state. * Send message to keyguard telling it to reset its state.