commit 7d442cb38e34be538e06d73785526d24d45c923d
author Colin Cross <ccross@android.com> Tue Aug 03 01:44:41 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 03 01:44:41 2021 +0000
tree 7a96cd94d83f6efe08e12bd1b42e2dd2e70086bb
parent 8b8ec54771b47203b8403d3160b12c1c1fb95087
parent 042d89de7f2a2ff0d98057d8bad07c9823e50999

Add kotlinx_coroutines_test am: 39c974555d am: 365e8bb018 am: 042d89de7f

Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/1783568

Change-Id: Ib39929dba25b02dd675a9d66e2b004e94da0a5eb

Android.bp

diff --git a/Android.bp b/Android.bp
index ce531ac..1537c76 100644
--- a/Android.bp
+++ b/Android.bp
@@ -76,3 +76,16 @@
         "androidx.annotation_annotation",
     ],
 }
+
+java_library {
+    name: "kotlinx_coroutines_test",
+    host_supported: true,
+    srcs: ["kotlinx-coroutines-test/src/**/*.kt"],
+    kotlincflags: [
+        "-Xuse-experimental=kotlinx.coroutines.InternalCoroutinesApi",
+        "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
+    ],
+    libs: [
+        "kotlinx_coroutines",
+    ],
+}

kotlinx-coroutines-test/src/internal/MainTestDispatcher.kt

diff --git a/kotlinx-coroutines-test/src/internal/MainTestDispatcher.kt b/kotlinx-coroutines-test/src/internal/MainTestDispatcher.kt
index af1eee4..9953756 100644
--- a/kotlinx-coroutines-test/src/internal/MainTestDispatcher.kt
+++ b/kotlinx-coroutines-test/src/internal/MainTestDispatcher.kt
@@ -64,7 +64,7 @@
     override fun createDispatcher(allFactories: List<MainDispatcherFactory>): MainCoroutineDispatcher {
         val originalFactory = allFactories.asSequence()
             .filter { it !== this }
-            .maxBy { it.loadPriority } ?: MissingMainCoroutineDispatcherFactory
+            .maxByOrNull { it.loadPriority } ?: MissingMainCoroutineDispatcherFactory
         return TestMainDispatcher(originalFactory)
     }