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

am 92026680: Merge "Don\'t crash if a user can\'t be created" into lmp-dev

Browse Source 
* commit '92026680fc32d51f8ceecb4c4c66a98c6d14c0ed':
  Don't crash if a user can't be created
This commit is contained in:
Adrian Roos
2014-09-18 12:51:28 +00:00
committed by Android Git Automerger
parent fda56feca0 763546a15a
commit c82d32e92d
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
View File

@@ -227,7 +227,14 @@ public class UserSwitcherController {
int id;
if (record.isGuest && record.info == null) {
// No guest user. Create one.
id = mUserManager.createGuest(mContext, mContext.getString(R.string.guest_nickname)).id;
UserInfo guest = mUserManager.createGuest(
mContext, mContext.getString(R.string.guest_nickname));
if (guest == null) {
// Couldn't create guest, most likely because there already exists one, we just
// haven't reloaded the user list yet.
return;
}
id = guest.id;
} else if (record.isAddUser) {
showAddUserDialog();
return;
@@ -564,8 +571,14 @@ public class UserSwitcherController {
cancel();
} else {
dismiss();
int id = mUserManager.createUser(
mContext.getString(R.string.user_new_user_name), 0 /* flags */).id;
UserInfo user = mUserManager.createUser(
mContext.getString(R.string.user_new_user_name), 0 /* flags */);
if (user == null) {
// Couldn't create user, most likely because there are too many, but we haven't
// been able to reload the list yet.
return;
}
int id = user.id;
Bitmap icon = UserIcons.convertToBitmap(UserIcons.getDefaultUserIcon(
id, /* light= */ false));
mUserManager.setUserIcon(id, icon);