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

Commit 5c4ad709 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Prevent error due to new API" into rvc-dev

parents c30e3937 2bc620b6
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -367,8 +367,14 @@ public class UserSwitcherController implements Dumpable {
        int id;
        if (record.isGuest && record.info == null) {
            // No guest user. Create one.
            UserInfo guest = mUserManager.createGuest(
                    mContext, mContext.getString(com.android.settingslib.R.string.guest_nickname));
            UserInfo guest;
            try {
                guest = mUserManager.createGuest(mContext,
                        mContext.getString(com.android.settingslib.R.string.guest_nickname));
            } catch (UserManager.UserOperationException e) {
                Log.e(TAG, "Couldn't create guest user", e);
                return;
            }
            if (guest == null) {
                // Couldn't create guest, most likely because there already exists one, we just
                // haven't reloaded the user list yet.