Merge "Fix NPE in StatusBar#onBackPressed()"

am: 6cfa7f2fee Change-Id: Ic29857e67231ff109535adf18882b869d7ce6af1
2017-09-06 15:17:05 +00:00
parent a672ffa42f 6cfa7f2fee
commit 10379e1f17
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -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;