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

Merge "Kotlin 1.5.31 compatibility" into sc-v2-dev

Browse Source
This commit is contained in:
Lucas Dupin
2021-10-26 02:06:39 +00:00
committed by Android (Google) Code Review
parent 9ad299f24d c6f4d4e163
commit 8316f682ec
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt
View File

@@ -120,7 +120,7 @@ class ControlsUiControllerImpl @Inject constructor (
private val onSeedingComplete = Consumer<Boolean> { private val onSeedingComplete = Consumer<Boolean> {
accepted -> accepted ->
if (accepted) { if (accepted) {
selectedStructure = controlsController.get().getFavorites().maxBy { selectedStructure = controlsController.get().getFavorites().maxByOrNull {
it.controls.size it.controls.size
} ?: EMPTY_STRUCTURE } ?: EMPTY_STRUCTURE
updatePreferences(selectedStructure) updatePreferences(selectedStructure)

2
packages/SystemUI/src/com/android/systemui/privacy/PrivacyChipBuilder.kt
View File

@@ -28,7 +28,7 @@ class PrivacyChipBuilder(private val context: Context, itemsList: List<PrivacyIt
appsAndTypes = itemsList.groupBy({ it.application }, { it.privacyType }) appsAndTypes = itemsList.groupBy({ it.application }, { it.privacyType })
.toList() .toList()
.sortedWith(compareBy({ -it.second.size }, // Sort by number of AppOps .sortedWith(compareBy({ -it.second.size }, // Sort by number of AppOps
{ it.second.min() })) // Sort by "smallest" AppOpp (Location is largest) { it.second.minOrNull() })) // Sort by "smallest" AppOpp (Location is largest)
types = itemsList.map { it.privacyType }.distinct().sorted() types = itemsList.map { it.privacyType }.distinct().sorted()
} }