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

Merge "Fix NPE if keyboard settings is launched by work apps"

Browse Source
This commit is contained in:
Wilson Wu
2022-02-11 06:27:41 +00:00
committed by Android (Google) Code Review
parent 78ba8d0bb4 ddb5147649
commit 2683549e29
3 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,16 +68,35 @@ public class AvailableVirtualKeyboardFragment extends DashboardFragment
public void onAttach(Context context) {
super.onAttach(context);
final int profileType = getArguments().getInt(ProfileSelectFragment.EXTRA_PROFILE);
if (profileType == ProfileSelectFragment.ProfileType.WORK) {
final UserManager userManager = UserManager.get(context);
final UserHandle workUser = Utils.getManagedProfile(userManager);
// get work userId
mUserId = Utils.getManagedProfileId(userManager, UserHandle.myUserId());
mUserAwareContext = context.createContextAsUser(workUser, 0);
} else {
mUserId = UserHandle.myUserId();
mUserAwareContext = context;
final UserManager userManager = context.getSystemService(UserManager.class);
final int currentUserId = UserHandle.myUserId();
final int newUserId;
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);
break;
}
case ProfileSelectFragment.ProfileType.PERSONAL: {
final UserHandle primaryUser = userManager.getPrimaryUser().getUserHandle();
newUserId = primaryUser.getIdentifier();
newUserAwareContext = context.createContextAsUser(primaryUser, 0);
break;
}
default:
newUserId = currentUserId;
newUserAwareContext = context;
}
mUserId = newUserId;
mUserAwareContext = newUserAwareContext;
}
@Override