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