Try to officially disconnect controller in more cases

In cases where we intentionally ignore a connection request, we
don't currently attempt to call onDisconnected on the controller
in all cases. This means such controllers may not be aware they
are ignored. Even if some cases only happen with malformed or
malicious connection attempts, it's still useful to try and
disconnect the connection officially.

PiperOrigin-RevId: 785814501

Author: tonihei

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

@@ -2264,7 +2264,7 @@ default void onPeriodicSessionPositionInfoChanged(
 
     // Mostly matched with MediaController.ControllerCallback
 
-    default void onDisconnected(int seq) throws RemoteException {}
+    default void onDisconnected(int seq) {}
 
     default void setCustomLayout(int seq, List<CommandButton> layout) throws RemoteException {}
 

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

@@ -1012,11 +1012,7 @@ private ControllerInfo tryGetController(RemoteUserInfo remoteUserInfo) {
               /* maxCommandsForMediaItems= */ 0);
       MediaSession.ConnectionResult connectionResult = sessionImpl.onConnectOnHandler(controller);
       if (!connectionResult.isAccepted) {
-        try {
-          controllerCb.onDisconnected(/* seq= */ 0);
-        } catch (RemoteException e) {
-          // Controller may have died prematurely.
-        }
+        controllerCb.onDisconnected(/* seq= */ 0);
         return null;
       }
       connectedControllersManager.addController(
@@ -1306,7 +1302,7 @@ public void onAvailableCommandsChangedFromPlayer(int seq, Player.Commands availa
     }
 
     @Override
-    public void onDisconnected(int seq) throws RemoteException {
+    public void onDisconnected(int seq) {
       // Calling MediaSessionCompat#release() is already done in release().
     }
 
@@ -1728,11 +1724,7 @@ public ConnectionTimeoutHandler(
     public void handleMessage(Message msg) {
       ControllerInfo controller = (ControllerInfo) msg.obj;
       if (connectedControllersManager.isConnected(controller)) {
-        try {
-          checkStateNotNull(controller.getControllerCb()).onDisconnected(/* seq= */ 0);
-        } catch (RemoteException e) {
-          // Controller may have died prematurely.
-        }
+        checkStateNotNull(controller.getControllerCb()).onDisconnected(/* seq= */ 0);
         connectedControllersManager.removeController(controller);
       }
     }

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

@@ -34,7 +34,6 @@
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
-import android.os.RemoteException;
 import androidx.annotation.CallSuper;
 import androidx.annotation.GuardedBy;
 import androidx.annotation.IntDef;
@@ -836,26 +835,21 @@ public void connect(
         @Nullable IMediaController caller, @Nullable Bundle connectionRequestBundle) {
       if (caller == null || connectionRequestBundle == null) {
         // Malformed call from potentially malicious controller.
-        // No need to notify that we're ignoring call.
+        SessionUtil.disconnectIMediaController(caller);
         return;
       }
       ConnectionRequest request;
       try {
         request = ConnectionRequest.fromBundle(connectionRequestBundle);
       } catch (RuntimeException e) {
         // Malformed call from potentially malicious controller.
-        // No need to notify that we're ignoring call.
         Log.w(TAG, "Ignoring malformed Bundle for ConnectionRequest", e);
+        SessionUtil.disconnectIMediaController(caller);
         return;
       }
       @Nullable MediaSessionService mediaSessionService = serviceReference.get();
       if (mediaSessionService == null) {
-        try {
-          caller.onDisconnected(/* seq= */ 0);
-        } catch (RemoteException e) {
-          // Controller may be died prematurely.
-          // Not an issue because we'll ignore it anyway.
-        }
+        SessionUtil.disconnectIMediaController(caller);
         return;
       }
       int callingPid = Binder.getCallingPid();
@@ -872,7 +866,7 @@ public void connect(
         handler.post(
             () -> {
               pendingControllers.remove(caller);
-              boolean shouldNotifyDisconnected = true;
+              boolean connected = false;
               try {
                 @Nullable MediaSessionService service = serviceReference.get();
                 if (service == null) {
@@ -889,30 +883,19 @@ public void connect(
                         request.connectionHints,
                         request.maxCommandsForMediaItems);
 
-                @Nullable MediaSession session;
-                try {
-                  session = service.onGetSession(controllerInfo);
-                  if (session == null) {
-                    return;
-                  }
-
-                  service.addSession(session);
-                  shouldNotifyDisconnected = false;
-
-                  session.handleControllerConnectionFromService(caller, controllerInfo);
-                } catch (Exception e) {
-                  // Don't propagate exception in service to the controller.
-                  Log.w(TAG, "Failed to add a session to session service", e);
+                @Nullable MediaSession session = service.onGetSession(controllerInfo);
+                if (session == null) {
+                  return;
                 }
+                service.addSession(session);
+                session.handleControllerConnectionFromService(caller, controllerInfo);
+                connected = true;
+              } catch (Exception e) {
+                // Don't propagate exception in service to the controller.
+                Log.w(TAG, "Failed to add a session to session service", e);
               } finally {
-                // Trick to call onDisconnected() in one place.
-                if (shouldNotifyDisconnected) {
-                  try {
-                    caller.onDisconnected(/* seq= */ 0);
-                  } catch (RemoteException e) {
-                    // Controller may be died prematurely.
-                    // Not an issue because we'll ignore it anyway.
-                  }
+                if (!connected) {
+                  SessionUtil.disconnectIMediaController(caller);
                 }
               }
             });
@@ -925,11 +908,7 @@ public void release() {
       serviceReference.clear();
       handler.removeCallbacksAndMessages(null);
       for (IMediaController controller : pendingControllers) {
-        try {
-          controller.onDisconnected(/* seq= */ 0);
-        } catch (RemoteException e) {
-          // Ignore. We're releasing.
-        }
+        SessionUtil.disconnectIMediaController(controller);
       }
       pendingControllers.clear();
     }

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

@@ -467,16 +467,12 @@ private int maybeCorrectMediaItemIndex(
   @SuppressWarnings("UngroupedOverloads") // Overload belongs to AIDL interface that is separated.
   public void connect(@Nullable IMediaController caller, @Nullable ControllerInfo controllerInfo) {
     if (caller == null || controllerInfo == null) {
+      SessionUtil.disconnectIMediaController(caller);
       return;
     }
     @Nullable MediaSessionImpl sessionImpl = this.sessionImpl.get();
     if (sessionImpl == null || sessionImpl.isReleased()) {
-      try {
-        caller.onDisconnected(/* seq= */ 0);
-      } catch (RemoteException e) {
-        // Controller may be died prematurely.
-        // Not an issue because we'll ignore it anyway.
-      }
+      SessionUtil.disconnectIMediaController(caller);
       return;
     }
     pendingControllers.add(controllerInfo);
@@ -596,12 +592,7 @@ public void connect(@Nullable IMediaController caller, @Nullable ControllerInfo
             }
           } finally {
             if (!connected) {
-              try {
-                caller.onDisconnected(/* seq= */ 0);
-              } catch (RemoteException e) {
-                // Controller may be died prematurely.
-                // Not an issue because we'll ignore it anyway.
-              }
+              SessionUtil.disconnectIMediaController(caller);
             }
           }
         });
@@ -613,21 +604,13 @@ public void release() {
       connectedControllersManager.removeController(controller);
       ControllerCb cb = controller.getControllerCb();
       if (cb != null) {
-        try {
-          cb.onDisconnected(/* seq= */ 0);
-        } catch (RemoteException e) {
-          // Ignore. We're releasing.
-        }
+        cb.onDisconnected(/* seq= */ 0);
       }
     }
     for (ControllerInfo controller : pendingControllers) {
       ControllerCb cb = controller.getControllerCb();
       if (cb != null) {
-        try {
-          cb.onDisconnected(/* seq= */ 0);
-        } catch (RemoteException e) {
-          // Ignore. We're releasing.
-        }
+        cb.onDisconnected(/* seq= */ 0);
       }
     }
     pendingControllers.clear();
@@ -2226,8 +2209,8 @@ public void onSearchResultChanged(
     }
 
     @Override
-    public void onDisconnected(int sequenceNumber) throws RemoteException {
-      iController.onDisconnected(sequenceNumber);
+    public void onDisconnected(int sequenceNumber) {
+      SessionUtil.disconnectIMediaController(iController);
     }
 
     @Override

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.media3.session;
+
+import android.os.RemoteException;
+import androidx.annotation.Nullable;
+
+/** Static utilities for the session module. */
+/* package */ class SessionUtil {
+
+  private SessionUtil() {}
+
+  /**
+   * Disconnect a {@link IMediaController}, ignoring remote exceptions in case the controller is
+   * broken or already died.
+   */
+  public static void disconnectIMediaController(@Nullable IMediaController controller) {
+    try {
+      if (controller != null) {
+        controller.onDisconnected(/* seq= */ 0);
+      }
+    } catch (RemoteException e) {
+      // Intentionally ignored. Controller may have died already or is malformed.
+    }
+  }
+}