Commit d3bd6eb8 authored Nov 07, 2012 by Jim Miller Committed by Android Git Automerger Nov 07, 2012

am 16ddf343: am 8eb3048a: am 87d0366d: Fix NPE caused by applications that try...

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

* commit '16ddf343':
  Fix NPE caused by applications that try to hide keyguard while it's not showing

parents 63121bd6 16ddf343

policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -881,8 +881,10 @@ public class KeyguardViewMediator {
		* Dismiss the keyguard through the security layers.
		*/
		public void dismiss() {
		if (mShowing && !mHidden) {
		mKeyguardViewManager.dismiss();
		}
		}

		/**
		* Send message to keyguard telling it to reset its state.