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

Commit 2e6e9465 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Add identityHashCode to App List item key"

parents dd107e2e e41f7cc8

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

+5 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import com.android.settingslib.spaprivileged.model.app.AppListModel 
import com.android.settingslib.spaprivileged.model.app.AppListViewModel

import com.android.settingslib.spaprivileged.model.app.AppRecord

import com.android.settingslib.spaprivileged.model.app.IAppListViewModel

import com.android.settingslib.spaprivileged.model.app.userId

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.flow.MutableStateFlow
@@ -135,7 +136,7 @@ private fun <T : AppRecord> AppListModel<T>.AppListWidget( 
                header()

            }



            items(count = list.size, key = { option to list[it].record.app.packageName }) {

            items(count = list.size, key = { list[it].record.itemKey(option) }) {

                remember(list) { getGroupTitleIfFirst(option, list, it) }

                    ?.let { group -> CategoryTitle(title = group) }
@@ -149,6 +150,9 @@ private fun <T : AppRecord> AppListModel<T>.AppListWidget( 
    }

}



private fun <T : AppRecord> T.itemKey(option: Int) =

    listOf(option, app.packageName, app.userId, System.identityHashCode(this))



/** Returns group title if this is the first item of the group. */

private fun <T : AppRecord> AppListModel<T>.getGroupTitleIfFirst(

    option: Int,