Merge "Don't crash if there's no QS panel" into lmp-dev (e60d6ed7) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java

+10 −5

Original line number	Diff line number	Diff line
		@@ -74,9 +74,11 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener
		mKeyguardUserSwitcher.show(true /* animate */);
		}
		} else {
		if (mQsPanel != null) {
		mQsPanel.showDetailAdapter(true,
		mQsPanel.getHost().getUserSwitcherController().userDetailAdapter);
		}
		}
		} else {
		Intent intent = ContactsContract.QuickContact.composeQuickContactsIntent(
		getContext(), v, ContactsContract.Profile.CONTENT_URI,
		@@ -93,9 +95,12 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener
		final UserManager um = UserManager.get(getContext());
		String text;
		if (um.isUserSwitcherEnabled()) {
		String currentUser = null;
		if (mQsPanel != null) {
		UserSwitcherController controller = mQsPanel.getHost()
		.getUserSwitcherController();
		String currentUser = controller.getCurrentUserName(mContext);
		currentUser = controller.getCurrentUserName(mContext);
		}
		if (TextUtils.isEmpty(currentUser)) {
		text = mContext.getString(R.string.accessibility_multi_user_switch_switcher);
		} else {