Handle HEADSETHOOK as 'play' in MediaButtonReceiver.onReceive

Issue: androidx#1581 #cherrypick PiperOrigin-RevId: 662515428
colinkho · Aug 15, 2024 · dd78cbe · dd78cbe
1 parent e5e6bcb
commit dd78cbe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -100,6 +100,10 @@
         action, as
         [documented](https://developer.android.com/reference/androidx/media3/session/MediaSession#media-key-events-mapping)
         ([#1493](https://github.com/androidx/media/issues/1493)).
+    *   Handle `KEYCODE_HEADSETHOOK` as a 'play' command in
+        `MediaButtonReceiver` when deciding whether to ignore it to avoid a
+        `ForegroundServiceDidNotStartInTimeException`
+        ([#1581](https://github.com/google/ExoPlayer/issues/1581)).
 *   UI:
 *   Downloads:
 *   OkHttp Extension:

diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaButtonReceiver.java b/libraries/session/src/main/java/androidx/media3/session/MediaButtonReceiver.java
@@ -128,7 +128,8 @@ public final void onReceive(Context context, @Nullable Intent intent) {
     }
     if (Util.SDK_INT >= 26) {
       if (keyEvent.getKeyCode() != KeyEvent.KEYCODE_MEDIA_PLAY
-          && keyEvent.getKeyCode() != KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE) {
+          && keyEvent.getKeyCode() != KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE
+          && keyEvent.getKeyCode() != KeyEvent.KEYCODE_HEADSETHOOK) {
         // Starting with Android 8 (API 26), the service must be started immediately in the
         // foreground when being started. Also starting with Android 8, the system sends media
         // button intents to this receiver only when the session is released or not active, meaning