commit 1fcc33d0c5f6a4c632bd6b9f37db8a7021e4b148
author Aurimas Liutikas <aurimas@google.com> Fri May 07 09:49:58 2021 -0700
committer Aurimas Liutikas <aurimas@google.com> Fri May 07 16:54:07 2021 +0000
tree 694bcbfbdf84a18f8ccc7b4a7038be69282b4ed4
parent fee0b8c85561f65a271a6fa104b065df42cd6e58

Fix uses of deprecated min() and max() functions

These have been removed in Kotlin 1.5 and this library
is still using the deprecated versions.

Test: make flickerlib
Bug: 187518755
Change-Id: I1381f2d40a296357a92b931127415d724c121aa2

libraries/flicker/src/com/android/server/wm/traces/common/Region.kt

diff --git a/libraries/flicker/src/com/android/server/wm/traces/common/Region.kt b/libraries/flicker/src/com/android/server/wm/traces/common/Region.kt
index a5b5756..ae2d499 100644
--- a/libraries/flicker/src/com/android/server/wm/traces/common/Region.kt
+++ b/libraries/flicker/src/com/android/server/wm/traces/common/Region.kt
@@ -17,10 +17,10 @@
 package com.android.server.wm.traces.common
 
 class Region(val rects: Array<Rect>) : Rect(
-    rects.map { it.left }.min() ?: 0,
-    rects.map { it.top }.min() ?: 0,
-    rects.map { it.right }.max() ?: 0,
-    rects.map { it.bottom }.max() ?: 0
+    rects.map { it.left }.minOrNull() ?: 0,
+    rects.map { it.top }.minOrNull() ?: 0,
+    rects.map { it.right }.maxOrNull() ?: 0,
+    rects.map { it.bottom }.maxOrNull() ?: 0
 ) {
     constructor(
         left: Int,

libraries/flicker/src/com/android/server/wm/traces/common/layers/Transform.kt

diff --git a/libraries/flicker/src/com/android/server/wm/traces/common/layers/Transform.kt b/libraries/flicker/src/com/android/server/wm/traces/common/layers/Transform.kt
index 6da3319..144fbab 100644
--- a/libraries/flicker/src/com/android/server/wm/traces/common/layers/Transform.kt
+++ b/libraries/flicker/src/com/android/server/wm/traces/common/layers/Transform.kt
@@ -132,10 +132,10 @@
         val rightBottom = multiplyVec2(matrix, rect.right, rect.bottom)
 
         return RectF(
-            left = arrayOf(leftTop.x, rightTop.x, leftBottom.x, rightBottom.x).min() ?: 0f,
-            top = arrayOf(leftTop.y, rightTop.y, leftBottom.y, rightBottom.y).min() ?: 0f,
-            right = arrayOf(leftTop.x, rightTop.x, leftBottom.x, rightBottom.x).min() ?: 0f,
-            bottom = arrayOf(leftTop.y, rightTop.y, leftBottom.y, rightBottom.y).min() ?: 0f
+            left = arrayOf(leftTop.x, rightTop.x, leftBottom.x, rightBottom.x).minOrNull() ?: 0f,
+            top = arrayOf(leftTop.y, rightTop.y, leftBottom.y, rightBottom.y).minOrNull() ?: 0f,
+            right = arrayOf(leftTop.x, rightTop.x, leftBottom.x, rightBottom.x).minOrNull() ?: 0f,
+            bottom = arrayOf(leftTop.y, rightTop.y, leftBottom.y, rightBottom.y).minOrNull() ?: 0f
         )
     }