diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2021-05-18 23:17:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-18 23:17:14 +0000 |
| commit | 07b133200e3c6b1c1ba27116e90109b1d2cc6a67 (patch) | |
| tree | 0ba1896045b67bf6dd1fb8f2470fc79a13b68fcc | |
| parent | e935209791ce7923b4b633ac73c28cb8db2a91e9 (diff) | |
| parent | ce196881e97427caaad1677a1a9523d18faf8122 (diff) | |
| download | trebuchet-07b133200e3c6b1c1ba27116e90109b1d2cc6a67.tar.gz | |
Revert^2 "Fix usage of minBy to unblock Kotlin 1.5 upgrade" am: 060dea15b0 am: ce196881e9android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
Original change: https://android-review.googlesource.com/c/platform/tools/trebuchet/+/1709772
Change-Id: Iefb96d7ecf1f36b89358e19eb95e6be2bf99a08e
| -rw-r--r-- | core/common/src/main/kotlin/trebuchet/queries/SliceQueries.kt | 2 | ||||
| -rw-r--r-- | trebuchet/startup-common/src/StartupCommon.kt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/common/src/main/kotlin/trebuchet/queries/SliceQueries.kt b/core/common/src/main/kotlin/trebuchet/queries/SliceQueries.kt index 79a9183..00f9953 100644 --- a/core/common/src/main/kotlin/trebuchet/queries/SliceQueries.kt +++ b/core/common/src/main/kotlin/trebuchet/queries/SliceQueries.kt @@ -113,7 +113,7 @@ fun ThreadModel.selectAll(predicate: (Slice) -> Boolean): List<Slice> { * @param predicate The predicate used to test slices */ fun Model.selectFirst(predicate: (Slice) -> Boolean) : Slice? { - return this.processes.values.mapNotNull { it.selectFirst(predicate) }.minBy { it.startTime } + return this.processes.values.mapNotNull { it.selectFirst(predicate) }.minByOrNull { it.startTime } } diff --git a/trebuchet/startup-common/src/StartupCommon.kt b/trebuchet/startup-common/src/StartupCommon.kt index 75ed400..2cf4793 100644 --- a/trebuchet/startup-common/src/StartupCommon.kt +++ b/trebuchet/startup-common/src/StartupCommon.kt @@ -115,7 +115,7 @@ fun Model.findProcess(queryName: String, map { it.slices }. filter { it.isNotEmpty() }. map { it.first().startTime }. - min() ?: throw MissingProcessInfoException(process.id) + minOrNull() ?: throw MissingProcessInfoException(process.id) if (firstSliceStart in lowerBound..upperBound) { return process @@ -142,7 +142,7 @@ fun Model.getStartupEvents() : List<StartupEvent> { val newProc = this.findProcess(newProcName, systemServerSlice.startTime, systemServerSlice.endTime) val startProcSlice = systemServerProc.findFirstSlice(SLICE_NAME_PROC_START, newProcName, systemServerSlice.startTime, systemServerSlice.endTime) val rfdSlice = systemServerProc.findFirstSliceOrNull(SLICE_NAME_REPORT_FULLY_DRAWN, newProcName, systemServerSlice.startTime) - val firstSliceTime = newProc.threads.map { it.slices.firstOrNull()?.startTime ?: Double.POSITIVE_INFINITY }.min()!! + val firstSliceTime = newProc.threads.map { it.slices.firstOrNull()?.startTime ?: Double.POSITIVE_INFINITY }.minOrNull()!! val schedSliceInfo : MutableMap<SchedulingState, Double> = mutableMapOf() newProc.threads.first().schedSlices.forEach schedLoop@ { schedSlice -> |