From 347da7e6a1f02a38df85b0c9262d944ef325f1c9 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Tue, 11 Jun 2024 09:17:27 -0700
Subject: [PATCH] Add `@CallSuper` to `TrackSelectionParameters.toBundle`

PiperOrigin-RevId: 642292328
---
 api.txt                                                         | 2 +-
 .../java/androidx/media3/common/TrackSelectionParameters.java   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/api.txt b/api.txt
index 8db8183ab6..f239bc5f02 100644
--- a/api.txt
+++ b/api.txt
@@ -1078,7 +1078,7 @@ package androidx.media3.common {
     method public androidx.media3.common.TrackSelectionParameters.Builder buildUpon();
     method public static androidx.media3.common.TrackSelectionParameters fromBundle(android.os.Bundle);
     method public static androidx.media3.common.TrackSelectionParameters getDefaults(android.content.Context);
-    method public android.os.Bundle toBundle();
+    method @CallSuper public android.os.Bundle toBundle();
     field public final com.google.common.collect.ImmutableSet<java.lang.Integer> disabledTrackTypes;
     field public final boolean forceHighestSupportedBitrate;
     field public final boolean forceLowestBitrate;
diff --git a/libraries/common/src/main/java/androidx/media3/common/TrackSelectionParameters.java b/libraries/common/src/main/java/androidx/media3/common/TrackSelectionParameters.java
index d5286fc2ef..0334db1b64 100644
--- a/libraries/common/src/main/java/androidx/media3/common/TrackSelectionParameters.java
+++ b/libraries/common/src/main/java/androidx/media3/common/TrackSelectionParameters.java
@@ -26,6 +26,7 @@ import android.graphics.Point;
 import android.os.Bundle;
 import android.os.Looper;
 import android.view.accessibility.CaptioningManager;
+import androidx.annotation.CallSuper;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import androidx.media3.common.util.BundleCollectionUtil;
@@ -1420,6 +1421,7 @@ public class TrackSelectionParameters {
    */
   @UnstableApi protected static final int FIELD_CUSTOM_ID_BASE = 1000;
 
+  @CallSuper
   public Bundle toBundle() {
     Bundle bundle = new Bundle();