Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebb0b118 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 98a53594: am 0e767b29: am 5c533884: Merge "Make dismissKeyguardLw use...

am 98a53594: am 0e767b29: am 5c533884: Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev

* commit '98a53594':
  Make dismissKeyguardLw use KeyguardViewMediator.dismiss().
parents 1540a21f 98a53594
Loading
Loading
Loading
Loading
+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();
                    }
                });
                }
            });
        }
    }