Merge 01ee1bd into c1adf5b

Author: gsakakihara

firebase-messaging/CHANGELOG.md

@@ -1,10 +1,13 @@
 # Unreleased
 
+# 23.1.1
+
+* [fixed] Fixed deadlock when handling simultaneous messages.
+
 # 23.1.0
 * [unchanged] Updated to accommodate the release of the updated
   [messaging_longer] Kotlin extensions library.
 
-
 ## Kotlin
 The Kotlin extensions library transitively includes the updated
   `firebase-messaging` library. The Kotlin extensions library has the following

firebase-messaging/src/main/java/com/google/firebase/messaging/WakeLockHolder.java

@@ -108,9 +108,7 @@ static void sendWakefulServiceIntent(
         wakeLock.acquire(WAKE_LOCK_ACQUIRE_TIMEOUT_MILLIS);
       }
 
-      connection
-          .sendIntent(intent)
-          .addOnCompleteListener(Runnable::run, t -> completeWakefulIntent(intent));
+      connection.sendIntent(intent).addOnCompleteListener(t -> completeWakefulIntent(intent));
     }
   }
 

firebase-messaging/src/test/java/com/google/firebase/messaging/WakeLockHolderRoboTest.java

@@ -27,6 +27,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.shadows.ShadowLooper;
 import org.robolectric.shadows.ShadowPowerManager;
 
 @RunWith(RobolectricTestRunner.class)
@@ -77,6 +78,7 @@ public void testSendWakefulServiceIntent_ReleasesWakeLock() {
     WakeLock wakeLock = ShadowPowerManager.getLatestWakeLock();
     taskCompletionSource.setResult(null);
 
+    ShadowLooper.idleMainLooper();
     assertThat(wakeLock.isHeld()).isFalse();
   }