Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2663abe authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Allow creating last user even if a guest exists. 

Bug: 15934700

Also fix missing icon when user has no icon.

Change-Id: I07c76043df9cda8aeccecb09289d570845dc4560
parent dc16286f

src/com/android/settings/users/UserSettings.java

+6 −1
Original line number Diff line number Diff line
@@ -794,6 +794,8 @@ public class UserSettings extends SettingsPreferenceFragment 
                } else {

                    setPhotoId(pref, user);

                }

            } else {

                pref.setIcon(getEncircledDefaultAvatar());

            }

        }
@@ -825,7 +827,7 @@ public class UserSettings extends SettingsPreferenceFragment 
        if (missingIcons.size() > 0) {

            loadIconsAsync(missingIcons);

        }

        boolean moreUsers = mUserManager.getMaxSupportedUsers() > users.size();

        boolean moreUsers = mUserManager.canAddMoreUsers();

        mAddUser.setEnabled(moreUsers);

    }
@@ -841,6 +843,9 @@ public class UserSettings extends SettingsPreferenceFragment 
            protected Void doInBackground(List<Integer>... values) {

                for (int userId : values[0]) {

                    Bitmap bitmap = mUserManager.getUserIcon(userId);

                    if (bitmap == null) {

                        bitmap = createBitmapFromDrawable(R.drawable.ic_avatar_default_1);

                    }

                    mUserIcons.append(userId, bitmap);

                }

                return null;