PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix keyboard settings crash in multi-user case" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-08 08:03:36 +00:00
committed by Android (Google) Code Review
parent 34eecaad79 237a06e0c1
commit 897b72eb1b
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
View File

@@ -74,15 +74,11 @@ public class AvailableVirtualKeyboardFragment extends DashboardFragment
final Context newUserAwareContext; final Context newUserAwareContext;
switch (profileType) { switch (profileType) {
case ProfileSelectFragment.ProfileType.WORK: { case ProfileSelectFragment.ProfileType.WORK: {
final UserHandle workUser; // If the user is a managed profile user, use currentUserId directly. Or get the
if (currentUserId == UserHandle.MIN_SECONDARY_USER_ID) { // managed profile userId instead.
newUserId = currentUserId; newUserId = userManager.isManagedProfile()
workUser = UserHandle.of(currentUserId); ? currentUserId : Utils.getManagedProfileId(userManager, currentUserId);
} else { newUserAwareContext = context.createContextAsUser(UserHandle.of(newUserId), 0);
newUserId = Utils.getManagedProfileId(userManager, currentUserId);
workUser = Utils.getManagedProfile(userManager);
}
newUserAwareContext = context.createContextAsUser(workUser, 0);
break; break;
} }
case ProfileSelectFragment.ProfileType.PERSONAL: { case ProfileSelectFragment.ProfileType.PERSONAL: {