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

Commit a8b5d2b5 authored by Kensuke Matsui's avatar Kensuke Matsui Committed by android-build-merger
Browse files

Merge "Fix NPE in StatusBar#onBackPressed()" am: 6cfa7f2f am: 10379e1f am: 53a82701 

am: f61e73f1

Change-Id: I925498517f914575acba1d738bed2d77a01dfcb1
parents 4c05f548 f61e73f1

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

+1 −1
Original line number Diff line number Diff line
@@ -4787,7 +4787,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
            animateCollapsePanels();

            return true;

        }

        if (mKeyguardUserSwitcher.hideIfNotSimple(true)) {

        if (mKeyguardUserSwitcher != null && mKeyguardUserSwitcher.hideIfNotSimple(true)) {

            return true;

        }

        return false;