diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppListPage.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppListPage.kt index 030b70a75a8b3..07e42350233c7 100644 --- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppListPage.kt +++ b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppListPage.kt @@ -42,7 +42,6 @@ fun AppListPage( showInstantApps: Boolean = false, noMoreOptions: Boolean = false, matchAnyUserForAdmin: Boolean = false, - primaryUserOnly: Boolean = false, noItemMessage: String? = null, moreOptions: @Composable MoreOptionsScope.() -> Unit = {}, header: @Composable () -> Unit = {}, @@ -60,7 +59,7 @@ fun AppListPage( } }, ) { bottomPadding, searchQuery -> - UserProfilePager(primaryUserOnly) { userGroup -> + UserProfilePager { userGroup -> val appListInput = AppListInput( config = AppListConfig( userIds = userGroup.userInfos.map { it.id }, diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/common/UserProfilePager.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/common/UserProfilePager.kt index b5a4929c47f43..6a76c93ac9a9c 100644 --- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/common/UserProfilePager.kt +++ b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/common/UserProfilePager.kt @@ -38,14 +38,9 @@ data class UserGroup( ) @Composable -fun UserProfilePager( - primaryUserOnly: Boolean = false, - content: @Composable (userGroup: UserGroup) -> Unit, -) { +fun UserProfilePager(content: @Composable (userGroup: UserGroup) -> Unit) { val context = LocalContext.current - val userGroups = remember { - context.userManager.getUserGroups(primaryUserOnly) - } + val userGroups = remember { context.userManager.getUserGroups() } val titles = remember { val enterpriseRepository = EnterpriseRepository(context) userGroups.map { userGroup -> @@ -60,10 +55,9 @@ fun UserProfilePager( } } -private fun UserManager.getUserGroups(primaryUserOnly: Boolean): List { +private fun UserManager.getUserGroups(): List { val userGroupList = mutableListOf() val profileToShowInSettingsList = getProfiles(UserHandle.myUserId()) - .filter { userInfo -> !primaryUserOnly || userInfo.isPrimary } .map { userInfo -> userInfo to getUserProperties(userInfo.userHandle).showInSettings } profileToShowInSettingsList.filter { it.second == UserProperties.SHOW_IN_SETTINGS_WITH_PARENT }