Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev (5c533884) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -3899,14 +3899,18 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}

		public void dismissKeyguardLw() {
		if (mKeyguardMediator.isDismissable()) {
		if (mKeyguardMediator.isShowing()) {
		mHandler.post(new Runnable() {
		public void run() {
		if (mKeyguardMediator.isDismissable()) {
		// Can we just finish the keyguard straight away?
		mKeyguardMediator.keyguardDone(false, true);
		} else {
		// ask the keyguard to prompt the user to authenticate if necessary
		mKeyguardMediator.dismiss();
		}
		});
		}
		});
		}
		}