Merge branch 'main' into td/record-exception

Author: tejasd

firebase-crashlytics/CHANGELOG.md

@@ -1,5 +1,5 @@
 # Unreleased
-
+* [fixed] Execute failure listener outside the main thread  [#6535]
 
 # 19.0.0
 * [fixed] Force validation or rotation of FIDs.
@@ -574,4 +574,3 @@ The following release notes describe changes in the new SDK.
   from your `AndroidManifest.xml` file.
 * [removed] The `fabric.properties` and `crashlytics.properties` files are no
   longer supported. Remove them from your app.
-

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/CrashlyticsRegistrar.java

@@ -18,6 +18,7 @@
 import com.google.firebase.analytics.connector.AnalyticsConnector;
 import com.google.firebase.annotations.concurrent.Background;
 import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentContainer;
 import com.google.firebase.components.ComponentRegistrar;
@@ -42,6 +43,8 @@ public class CrashlyticsRegistrar implements ComponentRegistrar {
       Qualified.qualified(Background.class, ExecutorService.class);
   private final Qualified<ExecutorService> blockingExecutorService =
       Qualified.qualified(Blocking.class, ExecutorService.class);
+  private final Qualified<ExecutorService> lightweightExecutorService =
+      Qualified.qualified(Lightweight.class, ExecutorService.class);
 
   static {
     // Add Crashlytics as a dependency of Sessions when this class is loaded into memory.
@@ -57,6 +60,7 @@ public List<Component<?>> getComponents() {
             .add(Dependency.required(FirebaseInstallationsApi.class))
             .add(Dependency.required(backgroundExecutorService))
             .add(Dependency.required(blockingExecutorService))
+            .add(Dependency.required(lightweightExecutorService))
             .add(Dependency.deferred(CrashlyticsNativeComponent.class))
             .add(Dependency.deferred(AnalyticsConnector.class))
             .add(Dependency.deferred(FirebaseRemoteConfigInterop.class))
@@ -79,7 +83,8 @@ private FirebaseCrashlytics buildCrashlytics(ComponentContainer container) {
             container.getDeferred(AnalyticsConnector.class),
             container.getDeferred(FirebaseRemoteConfigInterop.class),
             container.get(backgroundExecutorService),
-            container.get(blockingExecutorService));
+            container.get(blockingExecutorService),
+            container.get(lightweightExecutorService));
 
     long duration = System.currentTimeMillis() - startTime;
     if (duration > 16) {

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.java

@@ -68,7 +68,8 @@ public class FirebaseCrashlytics {
       @NonNull Deferred<AnalyticsConnector> analyticsConnector,
       @NonNull Deferred<FirebaseRemoteConfigInterop> remoteConfigInteropDeferred,
       ExecutorService backgroundExecutorService,
-      ExecutorService blockingExecutorService) {
+      ExecutorService blockingExecutorService,
+      ExecutorService lightExecutorService) {
 
     Context context = app.getApplicationContext();
     final String appIdentifier = context.getPackageName();
@@ -161,7 +162,8 @@ public class FirebaseCrashlytics {
     // Kick off actually fetching the settings.
     settingsController
         .loadSettingsData(crashlyticsWorkers)
-        .addOnFailureListener(ex -> Logger.getLogger().e("Error fetching settings.", ex));
+        .addOnFailureListener(
+            lightExecutorService, ex -> Logger.getLogger().e("Error fetching settings.", ex));
 
     final boolean finishCoreInBackground = core.onPreExecute(appData, settingsController);