timeout race for 10 sec

Author: themiswang

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

@@ -341,6 +341,7 @@ private void persistEvent(
     if (!isFatal) {
       crashlyticsWorkers.diskWrite.submit(
           () -> {
+            Logger.getLogger().d("disk worker: log non-fatal event to persistence");
             reportPersistence.persistEvent(finallizedEvent, sessionId, isHighPriority);
           });
       return;

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/concurrency/CrashlyticsTasks.java

@@ -21,7 +21,11 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.crashlytics.internal.Logger;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.concurrent.Executor;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -41,6 +45,7 @@ public final class CrashlyticsTasks {
   public static <T> Task<T> race(Task<T> task1, Task<T> task2) {
     CancellationTokenSource cancellation = new CancellationTokenSource();
     TaskCompletionSource<T> result = new TaskCompletionSource<>(cancellation.getToken());
+    Timer timer = new Timer();
 
     AtomicBoolean otherTaskCancelled = new AtomicBoolean(false);
 
@@ -62,6 +67,15 @@ public static <T> Task<T> race(Task<T> task1, Task<T> task2) {
     task1.continueWithTask(DIRECT, continuation);
     task2.continueWithTask(DIRECT, continuation);
 
+    timer.schedule(
+        new TimerTask() {
+          @Override
+          public void run() {
+            Logger.getLogger().d("Race gets timed out");
+            result.trySetException(new TimeoutException("Race result gets timed out"));
+          }
+        },
+        10 * 1000);
     return result.getTask();
   }
 

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsController.java

@@ -18,8 +18,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.google.android.gms.tasks.SuccessContinuation;
+import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
@@ -190,38 +189,41 @@ public Task<Void> loadSettingsData(
     // TODO(mrober): Refactor to call worker directly, not expose executor.
     return dataCollectionArbiter
         .waitForDataCollectionPermission()
-        .onSuccessTask(
+        .continueWithTask(
             crashlyticsWorkers.common,
-            new SuccessContinuation<Void, Void>() {
-              @NonNull
+            new Continuation<Void, Task<Void>>() {
               @Override
-              public Task<Void> then(@Nullable Void aVoid) throws Exception {
-                // Waited for data collection permission, so this is safe.
-                final boolean dataCollectionToken = true;
-                Future<JSONObject> settingsFuture =
-                    crashlyticsWorkers
-                        .network
-                        .getExecutor()
-                        .submit(() -> settingsSpiCall.invoke(settingsRequest, dataCollectionToken));
-                // TODO(mrober): Should we add a timeout here, or let the entire init timeout?
-                JSONObject settingsJson = settingsFuture.get();
-
-                if (settingsJson != null) {
-                  final Settings fetchedSettings =
-                      settingsJsonParser.parseSettingsJson(settingsJson);
-                  cachedSettingsIo.writeCachedSettings(
-                      fetchedSettings.expiresAtMillis, settingsJson);
-                  logSettings(settingsJson, "Loaded settings: ");
-
-                  setStoredBuildInstanceIdentifier(settingsRequest.instanceId);
-
-                  // Update the regular settings.
-                  settings.set(fetchedSettings);
-
-                  // Signal the Task that we have a new valid settings
-                  settingsTask.get().trySetResult(fetchedSettings);
+              public Task<Void> then(@NonNull Task<Void> task) throws Exception {
+                if (task.isSuccessful()) {
+                  final boolean dataCollectionToken = true;
+                  Future<JSONObject> settingsFuture =
+                      crashlyticsWorkers
+                          .network
+                          .getExecutor()
+                          .submit(
+                              () -> settingsSpiCall.invoke(settingsRequest, dataCollectionToken));
+                  // TODO(mrober): Should we add a timeout here, or let the entire init timeout?
+                  JSONObject settingsJson = settingsFuture.get();
+
+                  if (settingsJson != null) {
+                    final Settings fetchedSettings =
+                        settingsJsonParser.parseSettingsJson(settingsJson);
+                    cachedSettingsIo.writeCachedSettings(
+                        fetchedSettings.expiresAtMillis, settingsJson);
+                    logSettings(settingsJson, "Loaded settings: ");
+
+                    setStoredBuildInstanceIdentifier(settingsRequest.instanceId);
+
+                    // Update the regular settings.
+                    settings.set(fetchedSettings);
+
+                    // Signal the Task that we have a new valid settings
+                    settingsTask.get().trySetResult(fetchedSettings);
+                    return Tasks.forResult(null);
+                  }
                 }
-
+                Logger.getLogger().d("waitForDataCollectionPermission failed, set setting to null");
+                settingsTask.get().trySetResult(null);
                 return Tasks.forResult(null);
               }
             });