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

Commit 8316f682 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

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

parents 9ad299f2 c6f4d4e1

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

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ class ControlsUiControllerImpl @Inject constructor ( 
    private val onSeedingComplete = Consumer<Boolean> {

        accepted ->

            if (accepted) {

                selectedStructure = controlsController.get().getFavorites().maxBy {

                selectedStructure = controlsController.get().getFavorites().maxByOrNull {

                    it.controls.size

                } ?: EMPTY_STRUCTURE

                updatePreferences(selectedStructure)

packages/SystemUI/src/com/android/systemui/privacy/PrivacyChipBuilder.kt

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class PrivacyChipBuilder(private val context: Context, itemsList: List<PrivacyIt 
        appsAndTypes = itemsList.groupBy({ it.application }, { it.privacyType })

                .toList()

                .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()

    }