Merge pull request #2625 from nift4:mbrcontext

PiperOrigin-RevId: 786218618

Author: copybara-github

RELEASENOTES.md

@@ -87,6 +87,9 @@
     *   Fix a bug that causes a player's first playback error to be incorrectly
         treated as a persistent custom exception. This prevents the application
         from recovering.
+    *   Add a `Context` parameter to
+        `MediaButtonReceiver.onForegroundServiceStartNotAllowedException`
+        ([#2625](https://github.com/androidx/media/pull/2625)).
 *   UI:
     *   Add `ProgressStateWithTickInterval` class and the corresponding
         `rememberProgressStateWithTickInterval` Composable to

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

@@ -190,7 +190,7 @@ protected final void handleIntentAndMaybeStartTheService(
         } catch (/* ForegroundServiceStartNotAllowedException */ IllegalStateException e) {
           if (SDK_INT >= 31 && Api31.instanceOfForegroundServiceStartNotAllowedException(e)) {
             onForegroundServiceStartNotAllowedException(
-                serviceIntent, Api31.castToForegroundServiceStartNotAllowedException(e));
+                context, serviceIntent, Api31.castToForegroundServiceStartNotAllowedException(e));
           } else {
             throw e;
           }
@@ -226,6 +226,21 @@ protected boolean shouldStartForegroundService(Context context, Intent intent) {
     return true;
   }
 
+  /**
+   * @deprecated Use {@link #onForegroundServiceStartNotAllowedException(Context, Intent,
+   *     ForegroundServiceStartNotAllowedException)} instead.
+   */
+  @Deprecated
+  @RequiresApi(31)
+  protected void onForegroundServiceStartNotAllowedException(
+      Intent intent, ForegroundServiceStartNotAllowedException e) {
+    Log.e(
+        TAG,
+        "caught exception when trying to start a foreground service from the "
+            + "background: "
+            + e.getMessage());
+  }
+
   /**
    * This method is called when an exception is thrown when calling {@link
    * Context#startForegroundService(Intent)} as a result of receiving a media button event.
@@ -249,18 +264,16 @@ protected boolean shouldStartForegroundService(Context context, Intent intent) {
    * apps must use a {@link MediaBrowser} or {@link MediaController} to bind to the service instead
    * of broadcasting an intent.
    *
+   * @param context The broadcast receiver's {@linkplain Context}
    * @param intent The intent that was used {@linkplain Context#startForegroundService(Intent) for
    *     starting the foreground service}.
    * @param e The exception thrown by the system and caught by this broadcast receiver.
    */
+  @SuppressWarnings("deprecation")
   @RequiresApi(31)
   protected void onForegroundServiceStartNotAllowedException(
-      Intent intent, ForegroundServiceStartNotAllowedException e) {
-    Log.e(
-        TAG,
-        "caught exception when trying to start a foreground service from the "
-            + "background: "
-            + e.getMessage());
+      Context context, Intent intent, ForegroundServiceStartNotAllowedException e) {
+    onForegroundServiceStartNotAllowedException(intent, e);
   }
 
   @SuppressWarnings("QueryPermissionsNeeded") // Needs to be provided in the app manifest.