Merge remote-tracking branch 'origin/master' into ss-firestore-emulator-settings

Author: samtstern

firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallations.java

@@ -139,7 +139,6 @@ public Thread newThread(Runnable r) {
             TimeUnit.SECONDS,
             new LinkedBlockingQueue<>(),
             THREAD_FACTORY);
-    preConditionChecks();
   }
 
   /**
@@ -217,6 +216,7 @@ String getName() {
   @NonNull
   @Override
   public Task<String> getId() {
+    preConditionChecks();
     return Tasks.forResult(doGetId());
   }
 
@@ -231,6 +231,7 @@ public Task<String> getId() {
   @NonNull
   @Override
   public Task<InstallationTokenResult> getToken(boolean forceRefresh) {
+    preConditionChecks();
     Task<InstallationTokenResult> task = addGetAuthTokenListener();
     backgroundExecutor.execute(() -> doGetAuthToken(forceRefresh));
     return task;

transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/CctTransportBackend.java

@@ -48,9 +48,11 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.net.ConnectException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.UnknownHostException;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -268,6 +270,9 @@ private HttpResponse doSend(HttpRequest request) throws IOException {
       // JsonWriter often writes one character at a time.
       dataEncoder.encode(
           request.requestBody, new BufferedWriter(new OutputStreamWriter(outputStream)));
+    } catch (ConnectException | UnknownHostException e) {
+      Logging.e(LOG_TAG, "Couldn't open connection, returning with 500", e);
+      return new HttpResponse(500, null, 0);
     } catch (EncodingException | IOException e) {
       Logging.e(LOG_TAG, "Couldn't encode request, returning with 400", e);
       return new HttpResponse(400, null, 0);

transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore.java

@@ -54,7 +54,7 @@ public class SQLiteEventStore implements EventStore, SynchronizationGuard {
 
   private static final String LOG_TAG = "SQLiteEventStore";
 
-  static final int MAX_RETRIES = 10;
+  static final int MAX_RETRIES = 16;
 
   private static final int LOCK_RETRY_BACK_OFF_MILLIS = 50;
   private static final Encoding PROTOBUF_ENCODING = Encoding.of("proto");