Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Settings profile selector on HSUM" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-03-08 18:36:27 +00:00
committed by Android (Google) Code Review
parent 9cf7f6e861 0f37c7463b
commit 0003443c3d
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
View File

@@ -233,7 +233,12 @@ public abstract class ProfileSelectFragment extends DashboardFragment {
return ((ViewPagerAdapter) mViewPager.getAdapter())
.getPositionForProfileTab(extraTab);
}
final int userId = bundle.getInt(EXTRA_USER_ID, UserHandle.SYSTEM.getIdentifier());
final UserManager userManager = getSystemService(UserManager.class);
UserHandle mainUser = userManager.getMainUser();
if (mainUser == null) {
mainUser = UserHandle.SYSTEM;
}
final int userId = bundle.getInt(EXTRA_USER_ID, mainUser.getIdentifier());
final boolean isWorkProfile = UserManager.get(activity).isManagedProfile(userId);
if (isWorkProfile) {
return WORK_TAB;
@@ -325,7 +330,7 @@ public abstract class ProfileSelectFragment extends DashboardFragment {
List<UserInfo> userInfos = userManager.getProfiles(UserHandle.myUserId());
for (UserInfo userInfo : userInfos) {
if (userInfo.getUserHandle().isSystem()) {
if (userInfo.isMain()) {
fragments.add(createAndGetFragment(
ProfileType.PERSONAL,
bundle != null ? bundle : new Bundle(),
@@ -345,7 +350,7 @@ public abstract class ProfileSelectFragment extends DashboardFragment {
privateFragmentConstructor));
}
} else {
Log.d(TAG, "Not showing tab for unsupported user");
Log.d(TAG, "Not showing tab for unsupported user " + userInfo);
}
}