From 99cba0abccc54c77b99cca8a6813942bff8fa9cd Mon Sep 17 00:00:00 2001
From: Dan Field <dnfield@google.com>
Date: Wed, 14 Jul 2021 09:04:59 -0700
Subject: [PATCH] make it work on <API 24

---
 testing/scenario_app/android/app/build.gradle              | 1 +
 .../java/dev/flutter/scenarios/EngineLaunchE2ETest.java    | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/testing/scenario_app/android/app/build.gradle b/testing/scenario_app/android/app/build.gradle
index 316370fc4a684..74f91da99df19 100644
--- a/testing/scenario_app/android/app/build.gradle
+++ b/testing/scenario_app/android/app/build.gradle
@@ -47,6 +47,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01'
     implementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
+    implementation 'com.google.guava:guava:28.1-android'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test:rules:1.2.0'
diff --git a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenarios/EngineLaunchE2ETest.java b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenarios/EngineLaunchE2ETest.java
index c3e50feba9a2d..f951cc4024c63 100644
--- a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenarios/EngineLaunchE2ETest.java
+++ b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenarios/EngineLaunchE2ETest.java
@@ -10,11 +10,11 @@
 import androidx.test.InstrumentationRegistry;
 import androidx.test.internal.runner.junit4.statement.UiThreadStatement;
 import androidx.test.runner.AndroidJUnit4;
+import com.google.common.util.concurrent.SettableFuture;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import java.util.Arrays;
 import java.util.Locale;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -34,7 +34,7 @@ public void smokeTestEngineLaunch() throws Throwable {
     // as @UiThreadTest because having the message handler and the CompletableFuture both being
     // on the same thread will create deadlocks.
     UiThreadStatement.runOnUiThread(() -> engine.set(new FlutterEngine(applicationContext)));
-    CompletableFuture<Boolean> statusReceived = new CompletableFuture<>();
+    SettableFuture<Boolean> statusReceived = new SettableFuture<>();
 
     // Resolve locale to `en_US`.
     // This is required, so `window.locale` in populated in dart.
@@ -49,8 +49,7 @@ public void smokeTestEngineLaunch() throws Throwable {
         .get()
         .getDartExecutor()
         .setMessageHandler(
-            "waiting_for_status",
-            (byteBuffer, binaryReply) -> statusReceived.complete(Boolean.TRUE));
+            "waiting_for_status", (byteBuffer, binaryReply) -> statusReceived.set(Boolean.TRUE));
 
     // Launching the entrypoint will run the Dart code that sends the "waiting_for_status" platform
     // message.