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

Commit 485bfa10 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-69008cfea6c94780a0c9a9e956ead727" into tm-mainline-prod 

* changes:
  [automerge] Fix keyboard settings crash in multi-user case 2p: 237a06e0
  Fix keyboard settings crash in multi-user case
parents 0a4bbff8 41704f98

src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java

+5 −9
Original line number Diff line number Diff line
@@ -74,15 +74,11 @@ public class AvailableVirtualKeyboardFragment extends DashboardFragment 
        final Context newUserAwareContext;

        switch (profileType) {

            case ProfileSelectFragment.ProfileType.WORK: {

                final UserHandle workUser;

                if (currentUserId == UserHandle.MIN_SECONDARY_USER_ID) {

                    newUserId = currentUserId;

                    workUser = UserHandle.of(currentUserId);

                } else {

                    newUserId = Utils.getManagedProfileId(userManager, currentUserId);

                    workUser = Utils.getManagedProfile(userManager);

                }

                newUserAwareContext = context.createContextAsUser(workUser, 0);

                // If the user is a managed profile user, use currentUserId directly. Or get the

                // managed profile userId instead.

                newUserId = userManager.isManagedProfile()

                        ? currentUserId : Utils.getManagedProfileId(userManager, currentUserId);

                newUserAwareContext = context.createContextAsUser(UserHandle.of(newUserId), 0);

                break;

            }

            case ProfileSelectFragment.ProfileType.PERSONAL: {