| commit | 53a827016206d760a7ed85e7839e8a700dfad1a6 | [log] [tgz] |
|---|---|---|
| author | Kensuke Matsui <kensuke.matsui@sony.com> | Wed Sep 06 15:26:36 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 06 15:26:36 2017 +0000 |
| tree | 09bfba3388579b979a5027b800859c9f33f86dcf | |
| parent | 9a68d78b44c9fbd5889cc4028eedc711145eae9a [diff] | |
| parent | 10379e1f17c06619a25d941c60c1aa61109ef93a [diff] |
Merge "Fix NPE in StatusBar#onBackPressed()" am: 6cfa7f2fee am: 10379e1f17 Change-Id: Ie4db309fc0c75b0e5c9195cf1797abffd2c8a58c
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index ada98b7..fc56276 100644 --- 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 @@ animateCollapsePanels(); return true; } - if (mKeyguardUserSwitcher.hideIfNotSimple(true)) { + if (mKeyguardUserSwitcher != null && mKeyguardUserSwitcher.hideIfNotSimple(true)) { return true; } return false;