Merge "Fix NPE in StatusBar#onBackPressed()"

2017-09-06 15:10:18 +00:00
parent 94f1fd0da2 8dd4d35aa3
commit 6cfa7f2fee
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
@@ -4486,7 +4486,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;