From 32e1c127b2bb02cba2a40b941f237648a1a0c67a Mon Sep 17 00:00:00 2001
From: Greg Sakakihara <gsaka@google.com>
Date: Wed, 21 May 2025 11:26:06 -0700
Subject: [PATCH] Add a NamedThreadFactory to WithinAppServiceConnection's
 service connection Executor.

- Add back the NamedThreadFactory used by scheduledExecutorService that was removed by https://github.com/firebase/firebase-android-sdk/commit/6383f6d71218b24318372573aaf962711776f4d1
---
 firebase-messaging/CHANGELOG.md                              | 3 ++-
 .../firebase/messaging/WithinAppServiceConnection.java       | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/firebase-messaging/CHANGELOG.md b/firebase-messaging/CHANGELOG.md
index 5ea1053e78a..120620148dc 100644
--- a/firebase-messaging/CHANGELOG.md
+++ b/firebase-messaging/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
-
+* [changed] Added a NamedThreadFactory to WithinAppServiceConnection's service 
+  connection Executor.
 
 # 24.1.1
 * [changed] Bug fix in SyncTask to always unregister the receiver on the same
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/WithinAppServiceConnection.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/WithinAppServiceConnection.java
index 63d13467edd..08823c88c90 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/WithinAppServiceConnection.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/WithinAppServiceConnection.java
@@ -27,6 +27,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.common.stats.ConnectionTracker;
+import com.google.android.gms.common.util.concurrent.NamedThreadFactory;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
@@ -109,7 +110,9 @@ void finish() {
 
   @SuppressLint("ThreadPoolCreation")
   private static ScheduledThreadPoolExecutor createScheduledThreadPoolExecutor() {
-    ScheduledThreadPoolExecutor threadPoolExecutor = new ScheduledThreadPoolExecutor(1);
+    ScheduledThreadPoolExecutor threadPoolExecutor =
+        new ScheduledThreadPoolExecutor(
+            1, new NamedThreadFactory("Firebase-FirebaseInstanceIdServiceConnection"));
     threadPoolExecutor.setKeepAliveTime(EnhancedIntentService.MESSAGE_TIMEOUT_S * 2, SECONDS);
     threadPoolExecutor.allowCoreThreadTimeOut(true);
     return threadPoolExecutor;