Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3707131b: am eb578566: Merge "Don\'t crash if there\'s no QS panel" into lmp-dev

Browse Source 
* commit '3707131b22a683d10788247db0868bf96bd28ddf':
  Don't crash if there's no QS panel
This commit is contained in:
Adrian Roos
2014-09-09 16:54:44 +00:00
committed by Android Git Automerger
parent 6800165351 6381ca82ac
commit ae95b461c1
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 {