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

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

Merge "Fix NPE in StatusBar#onBackPressed()" 

am: 6cfa7f2f

Change-Id: Ic29857e67231ff109535adf18882b869d7ce6af1
parents a672ffa4 6cfa7f2f

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

+1 −1
Original line number Diff line number Diff line
@@ -4712,7 +4712,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;