From e1d12fc395d9f9edb28755a5b1026e26b378e005 Mon Sep 17 00:00:00 2001
From: tianyifeng <tianyifeng@google.com>
Date: Fri, 10 Feb 2023 14:57:53 +0000
Subject: [PATCH] Update notification play/pause button with matching player
 state

Issue: androidx/media#192
PiperOrigin-RevId: 508649684
---
 RELEASENOTES.md                                               | 2 ++
 .../androidx/media3/session/MediaNotificationManager.java     | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f14e30cb09..52af28a047 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -81,6 +81,8 @@
         ([#233](https://github.com/androidx/media/issues/233)).
     *   Make `QueueTimeline` more robust in case of a shady legacy session state
         ([#241](https://github.com/androidx/media/issues/241)).
+    *   Fix a bug where notification play/pause button doesn't update with
+        player state ([#192](https://github.com/androidx/media/issues/192)).
 *   Metadata:
     *   Parse multiple null-separated values from ID3 frames, as permitted by
         ID3 v2.4.
diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaNotificationManager.java b/libraries/session/src/main/java/androidx/media3/session/MediaNotificationManager.java
index 27c0cc4ece..30afcb411b 100644
--- a/libraries/session/src/main/java/androidx/media3/session/MediaNotificationManager.java
+++ b/libraries/session/src/main/java/androidx/media3/session/MediaNotificationManager.java
@@ -219,9 +219,11 @@ import java.util.concurrent.TimeoutException;
     if (startInForegroundRequired) {
       startForeground(mediaNotification);
     } else {
-      maybeStopForegroundService(/* removeNotifications= */ false);
+      // Notification manager has to be updated first to avoid missing updates
+      // (https://github.com/androidx/media/issues/192).
       notificationManagerCompat.notify(
           mediaNotification.notificationId, mediaNotification.notification);
+      maybeStopForegroundService(/* removeNotifications= */ false);
     }
   }