Fix race between media notification (controller) and legacy stub

Author: nift4

libraries/session/src/main/java/androidx/media3/session/MediaLibrarySessionImpl.java

@@ -27,7 +27,6 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.os.Bundle;
-import android.os.RemoteException;
 import androidx.annotation.Nullable;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.MediaMetadata;
@@ -359,19 +358,6 @@ protected MediaSessionServiceLegacyStub createLegacyBrowserService(
     return stub;
   }
 
-  @Override
-  protected void dispatchRemoteControllerTaskWithoutReturn(RemoteControllerTask task) {
-    super.dispatchRemoteControllerTaskWithoutReturn(task);
-    @Nullable MediaLibraryServiceLegacyStub legacyStub = getLegacyBrowserService();
-    if (legacyStub != null) {
-      try {
-        task.run(legacyStub.getBrowserLegacyCbForBroadcast(), /* seq= */ 0);
-      } catch (RemoteException e) {
-        Log.e(TAG, "Exception in using media1 API", e);
-      }
-    }
-  }
-
   private void maybeUpdateLegacyErrorState(ControllerInfo browser, LibraryResult<?> result) {
     if (libraryErrorReplicationMode == MediaLibrarySession.LIBRARY_ERROR_REPLICATION_MODE_NONE
         || browser.getControllerVersion() != ControllerInfo.LEGACY_CONTROLLER_VERSION) {

libraries/session/src/main/java/androidx/media3/session/MediaNotificationManager.java

@@ -406,20 +406,6 @@ public void onConnected(boolean shouldShowNotification) {
       }
     }
 
-    @Override
-    public void onMediaButtonPreferencesChanged(
-        MediaController controller, List<CommandButton> mediaButtonPreferences) {
-      mediaSessionService.onUpdateNotificationInternal(
-          session, /* startInForegroundWhenPaused= */ false);
-    }
-
-    @Override
-    public void onAvailableSessionCommandsChanged(
-        MediaController controller, SessionCommands commands) {
-      mediaSessionService.onUpdateNotificationInternal(
-          session, /* startInForegroundWhenPaused= */ false);
-    }
-
     @Override
     public ListenableFuture<SessionResult> onCustomCommand(
         MediaController controller, SessionCommand command, Bundle args) {
@@ -440,20 +426,6 @@ public void onDisconnected(MediaController controller) {
       mediaSessionService.onUpdateNotificationInternal(
           session, /* startInForegroundWhenPaused= */ false);
     }
-
-    @Override
-    public void onEvents(Player player, Player.Events events) {
-      // We must limit the frequency of notification updates, otherwise the system may suppress
-      // them.
-      if (events.containsAny(
-          Player.EVENT_PLAYBACK_STATE_CHANGED,
-          Player.EVENT_PLAY_WHEN_READY_CHANGED,
-          Player.EVENT_MEDIA_METADATA_CHANGED,
-          Player.EVENT_TIMELINE_CHANGED)) {
-        mediaSessionService.onUpdateNotificationInternal(
-            session, /* startInForegroundWhenPaused= */ false);
-      }
-    }
   }
 
   @SuppressLint("InlinedApi") // Using compile time constant FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK

libraries/session/src/main/java/androidx/media3/session/MediaSessionImpl.java

@@ -508,7 +508,7 @@ public ListenableFuture<SessionResult> setCustomLayout(
       ControllerInfo controller, ImmutableList<CommandButton> customLayout) {
     if (isMediaNotificationController(controller)) {
       sessionLegacyStub.setPlatformCustomLayout(customLayout);
-      sessionLegacyStub.updateLegacySessionPlaybackState(playerWrapper);
+      sessionLegacyStub.updateLegacySessionPlaybackState(playerWrapper, true);
     }
     return dispatchRemoteControllerTask(
         controller, (controller1, seq) -> controller1.setCustomLayout(seq, customLayout));
@@ -533,7 +533,7 @@ public ListenableFuture<SessionResult> setMediaButtonPreferences(
       ControllerInfo controller, ImmutableList<CommandButton> mediaButtonPreferences) {
     if (isMediaNotificationController(controller)) {
       sessionLegacyStub.setPlatformMediaButtonPreferences(mediaButtonPreferences);
-      sessionLegacyStub.updateLegacySessionPlaybackState(playerWrapper);
+      sessionLegacyStub.updateLegacySessionPlaybackState(playerWrapper, true);
     }
     return dispatchRemoteControllerTask(
         controller,