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

Commit 4db5832c authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Remove primaryUserOnly param from AppListPage 

Because userInfo.isPrimary is not exists in Headless System User Mode.

Fix: 284902200
Test: Manually on device with Headless System User Mode
Change-Id: I9bf7ccf3bf9c38ef4152dc069f991cf55c24f559
parent 4ee4adbb

packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppListPage.kt

+1 −2
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ fun <T : AppRecord> 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 <T : AppRecord> AppListPage( 
            }

        },

    ) { bottomPadding, searchQuery ->

        UserProfilePager(primaryUserOnly) { userGroup ->

        UserProfilePager { userGroup ->

            val appListInput = AppListInput(

                config = AppListConfig(

                    userIds = userGroup.userInfos.map { it.id },

packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/common/UserProfilePager.kt

+3 −9
Original line number Diff line number Diff line
@@ -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<UserGroup> {

private fun UserManager.getUserGroups(): List<UserGroup> {

    val userGroupList = mutableListOf<UserGroup>()

    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 }