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

Commit e680fcaa authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am cb6f8ac1: am 5ef697cb: Merge "Fix invalid keyguard state after pressing... 

am cb6f8ac1: am 5ef697cb: Merge "Fix invalid keyguard state after pressing back in bouncer" into lmp-dev

* commit 'cb6f8ac181fd75ff4e78326034a316f56efbc853':
  Fix invalid keyguard state after pressing back in bouncer
parents c52c0346 ef7f2b46

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+1 −3
Original line number Diff line number Diff line
@@ -298,9 +298,7 @@ public class StatusBarKeyguardViewManager { 
     */

    public boolean onBackPressed() {

        if (mBouncer.isShowing()) {

            mBouncer.hide(false /* destroyView */);

            mPhoneStatusBar.showKeyguard();

            updateStates();

            reset();

            return true;

        }

        return false;