Merge f5e504e into 6d645d0

Author: mrober

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/send/ReportQueue.java

@@ -16,6 +16,7 @@
 
 import android.annotation.SuppressLint;
 import android.database.SQLException;
+import android.os.SystemClock;
 import com.google.android.datatransport.Event;
 import com.google.android.datatransport.Priority;
 import com.google.android.datatransport.Transport;
@@ -39,10 +40,12 @@ final class ReportQueue {
   private static final int MS_PER_SECOND = 1_000;
   private static final int MS_PER_MINUTE = 60_000;
   private static final int MAX_DELAY_MS = 3_600_000; // 1 hour.
+  private static final int STARTUP_DURATION_MS = 2_000; // 2 seconds.
 
   private final double ratePerMinute;
   private final double base;
   private final long stepDurationMs;
+  private final long startTimeMs;
 
   private final int queueCapacity;
   private final BlockingQueue<Runnable> queue;
@@ -77,6 +80,8 @@ final class ReportQueue {
     this.transport = transport;
     this.onDemandCounter = onDemandCounter;
 
+    startTimeMs = SystemClock.elapsedRealtime();
+
     // The queue capacity is the per-minute rate number. // TODO(mrober): Round up to next int?
     queueCapacity = (int) ratePerMinute;
     queue = new ArrayBlockingQueue<>(queueCapacity);
@@ -146,14 +151,17 @@ private void sendReport(
       TaskCompletionSource<CrashlyticsReportWithSessionId> tcs) {
     Logger.getLogger()
         .d("Sending report through Google DataTransport: " + reportWithSessionId.getSessionId());
+    boolean isStartup = (SystemClock.elapsedRealtime() - startTimeMs) < STARTUP_DURATION_MS;
     transport.schedule(
         Event.ofUrgent(reportWithSessionId.getReport()),
         error -> {
           if (error != null) {
             tcs.trySetException(error);
             return;
           }
-          flushScheduledReportsIfAble();
+          if (isStartup) {
+            flushScheduledReportsIfAble();
+          }
           tcs.trySetResult(reportWithSessionId);
         });
   }