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

Merge "Fix incompatibilities with Kotlin 1.5.0"

Browse Source
This commit is contained in:
Aurimas Liutikas
2021-05-11 20:12:09 +00:00
committed by Gerrit Code Review
parent 565f3fe51c b8ca1157ab
commit 600dcaf908
3 changed files with 4 additions and 4 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

@@ -114,7 +114,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()
} }

4
tools/codegen/src/com/android/codegen/Utils.kt
View File

@@ -43,8 +43,8 @@ inline infix fun Int.times(action: () -> Unit) {
* cccc dd * cccc dd
*/ */
fun Iterable<Pair<String, String>>.columnize(separator: String = " | "): String { fun Iterable<Pair<String, String>>.columnize(separator: String = " | "): String {
val col1w = map { (a, _) -> a.length }.max()!! val col1w = map { (a, _) -> a.length }.maxOrNull()!!
val col2w = map { (_, b) -> b.length }.max()!! val col2w = map { (_, b) -> b.length }.maxOrNull()!!
return map { it.first.padEnd(col1w) + separator + it.second.padEnd(col2w) }.joinToString("\n") return map { it.first.padEnd(col1w) + separator + it.second.padEnd(col2w) }.joinToString("\n")
} }