From 1e4ecf8e7b9351c772d4545adcf89493966da73d Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Mon, 8 Sep 2014 15:20:07 +0200 Subject: Don't crash if there's no QS panel Bug: 17408080 Change-Id: I4632f3b1f484e2e0870f128031ab23db9c520837 --- .../android/systemui/statusbar/phone/MultiUserSwitch.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java index dc491183b4f0..685c184a672a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java @@ -74,8 +74,10 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener mKeyguardUserSwitcher.show(true /* animate */); } } else { - mQsPanel.showDetailAdapter(true, - mQsPanel.getHost().getUserSwitcherController().userDetailAdapter); + if (mQsPanel != null) { + mQsPanel.showDetailAdapter(true, + mQsPanel.getHost().getUserSwitcherController().userDetailAdapter); + } } } else { Intent intent = ContactsContract.QuickContact.composeQuickContactsIntent( @@ -93,9 +95,12 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener final UserManager um = UserManager.get(getContext()); String text; if (um.isUserSwitcherEnabled()) { - UserSwitcherController controller = mQsPanel.getHost() - .getUserSwitcherController(); - String currentUser = controller.getCurrentUserName(mContext); + String currentUser = null; + if (mQsPanel != null) { + UserSwitcherController controller = mQsPanel.getHost() + .getUserSwitcherController(); + currentUser = controller.getCurrentUserName(mContext); + } if (TextUtils.isEmpty(currentUser)) { text = mContext.getString(R.string.accessibility_multi_user_switch_switcher); } else { -- cgit v1.2.3-59-g8ed1b