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

Commit 2bc620b6 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Prevent error due to new API 

UserManager#createGuest will throw instead of returning null. Check for
it and react in the same way.

Test: no test
Bug: 158659165
Change-Id: If2d873e0e45cc20a2b6a5fc6588d9a4af29efb8b
parent 26bfc541

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

+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.