Address feedback

Author: mrober

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/concurrency/CrashlyticsWorkerTest.java

@@ -487,6 +487,26 @@ public void submitTaskWithContinuationThatCancels() throws Exception {
     assertThat(Tasks.await(crashlyticsWorker.submit(() -> "jk"))).isEqualTo("jk");
   }
 
+  @Test
+  public void submitTaskOnSuccess() throws Exception {
+    TaskCompletionSource<Integer> waitingSource = new TaskCompletionSource<>();
+    Task<Integer> waitingTask = waitingSource.getTask();
+
+    Task<String> task =
+        crashlyticsWorker.submitTaskOnSuccess(
+            () -> waitingTask,
+            integerResult -> {
+              // This gets called with the result when the waiting task resolves successfully.
+              return Tasks.forResult(integerResult + " Success!");
+            });
+
+    waitingSource.trySetResult(1337);
+
+    String result = Tasks.await(task);
+
+    assertThat(result).isEqualTo("1337 Success!");
+  }
+
   @Test
   public void submitTaskThatReturnsWithSuccessContinuation() throws Exception {
     Task<String> task =
@@ -499,7 +519,7 @@ public void submitTaskThatReturnsWithSuccessContinuation() throws Exception {
   }
 
   @Test
-  public void submitTaskThatThrowsWithSuccessContinuation() throws Exception {
+  public void submitTaskThatThrowsWithSuccessContinuation() {
     Task<String> task =
         crashlyticsWorker.submitTaskOnSuccess(
             () -> Tasks.forException(new IndexOutOfBoundsException()),

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/metadata/MetaDataStoreTest.java

@@ -93,6 +93,7 @@ public void testWriteUserData_allFields() throws Exception {
           storeUnderTest.writeUserData(SESSION_ID_1, metadataWithUserId(SESSION_ID_1).getUserId());
         });
     crashlyticsWorkers.diskWrite.await();
+    Thread.sleep(5);
     UserMetadata userData =
         UserMetadata.loadFromExistingSession(SESSION_ID_1, fileStore, crashlyticsWorkers);
     assertEquals(USER_ID, userData.getUserId());

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java

@@ -33,6 +33,7 @@
 import com.google.firebase.crashlytics.internal.Logger;
 import com.google.firebase.crashlytics.internal.NativeSessionFileProvider;
 import com.google.firebase.crashlytics.internal.analytics.AnalyticsEventLogger;
+import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsTasks;
 import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorkers;
 import com.google.firebase.crashlytics.internal.metadata.LogFileManager;
 import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
@@ -296,7 +297,7 @@ public Task<Boolean> then(@Nullable Void aVoid) throws Exception {
 
     Logger.getLogger().d("Waiting for send/deleteUnsentReports to be called.");
     // Wait for either the processReports callback to be called, or data collection to be enabled.
-    return Utils.race(collectionEnabled, reportActionProvided.getTask());
+    return CrashlyticsTasks.race(collectionEnabled, reportActionProvided.getTask());
   }
 
   /** This function must be called before opening the first session * */

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/Utils.java

@@ -14,11 +14,8 @@
 
 package com.google.firebase.crashlytics.internal.common;
 
-import android.annotation.SuppressLint;
 import android.os.Looper;
-import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CountDownLatch;
@@ -35,27 +32,6 @@ public final class Utils {
   /** Timeout in milliseconds for blocking on the main thread. Be careful about ANRs. */
   private static final int MAIN_TIMEOUT_MILLIS = 2_750;
 
-  /**
-   * @return A tasks that is resolved when either of the given tasks is resolved.
-   */
-  // TODO(b/261014167): Use an explicit executor in continuations.
-  @SuppressLint("TaskMainThread")
-  public static <T> Task<T> race(Task<T> t1, Task<T> t2) {
-    final TaskCompletionSource<T> result = new TaskCompletionSource<>();
-    Continuation<T, Void> continuation =
-        task -> {
-          if (task.isSuccessful()) {
-            result.trySetResult(task.getResult());
-          } else if (task.getException() != null) {
-            result.trySetException(task.getException());
-          }
-          return null;
-        };
-    t1.continueWith(continuation);
-    t2.continueWith(continuation);
-    return result.getTask();
-  }
-
   /**
    * Blocks until the given Task completes, and then returns the value the Task was resolved with,
    * if successful. If the Task fails, an exception will be thrown, wrapping the Exception of the