Merge "Fix NPE in StatusBar#onBackPressed()" am: 6cfa7f2fee

am: 10379e1f17 Change-Id: Ie4db309fc0c75b0e5c9195cf1797abffd2c8a58c
2017-09-06 15:26:36 +00:00
parent 9a68d78b44 10379e1f17
commit 53a8270162
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;