Merge branch 'main' into dconeybe/dataconnect/MutableStateFlowUseUpdateInsteadOfCompareAndSet

Author: dconeybe

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

@@ -36,6 +36,7 @@
 import com.google.firebase.crashlytics.internal.send.DataTransportCrashlyticsReportSender;
 import com.google.firebase.crashlytics.internal.settings.SettingsProvider;
 import com.google.firebase.crashlytics.internal.stacktrace.StackTraceTrimmingStrategy;
+import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -427,13 +428,15 @@ private static CrashlyticsReport.ApplicationExitInfo convertApplicationExitInfo(
   @VisibleForTesting
   @RequiresApi(api = Build.VERSION_CODES.KITKAT)
   public static String convertInputStreamToString(InputStream inputStream) throws IOException {
-    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-    byte[] bytes = new byte[DEFAULT_BUFFER_SIZE];
-    int length;
-    while ((length = inputStream.read(bytes)) != -1) {
-      byteArrayOutputStream.write(bytes, 0, length);
+    try (BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream);
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+      byte[] bytes = new byte[DEFAULT_BUFFER_SIZE];
+      int length;
+      while ((length = bufferedInputStream.read(bytes)) != -1) {
+        byteArrayOutputStream.write(bytes, 0, length);
+      }
+      return byteArrayOutputStream.toString(StandardCharsets.UTF_8.name());
     }
-    return byteArrayOutputStream.toString(StandardCharsets.UTF_8.name());
   }
 
   /** Finds the first ANR ApplicationExitInfo within the session. */

gradle/libs.versions.toml

@@ -27,7 +27,7 @@ firebaseAppdistributionGradle = "5.1.1"
 firebaseCommon = "21.0.0"
 firebaseComponents = "18.0.0"
 firebaseCrashlyticsGradle = "3.0.2"
-glide = "4.11.0"
+glide = "4.16.0"
 googleApiClient = "1.30.9"
 googleServices = "4.3.15"
 gradleErrorpronePlugin = "3.1.0"

smoke-tests/build.gradle

@@ -54,6 +54,7 @@ android {
   }
 
   compileOptions {
+    coreLibraryDesugaringEnabled true
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
@@ -97,6 +98,9 @@ dependencies {
   // Common utilities (instrumentation side)
   androidTestImplementation "androidx.test:runner:1.4.0"
   androidTestImplementation libs.junit
+
+  // Desugaring library
+  coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
 }
 
 clean.doLast {