From 3ab484d93f05735bc3af769f7349d86a09b18cbc Mon Sep 17 00:00:00 2001 From: ibaker Date: Mon, 31 Mar 2025 13:03:45 -0700 Subject: [PATCH] Stabilize various `setUserAgent()` and `Util.getUserAgent()` methods Issue: androidx/media#2286 PiperOrigin-RevId: 742367539 --- api.txt | 4 ++++ .../src/main/java/androidx/media3/common/util/Util.java | 1 - .../androidx/media3/datasource/DefaultHttpDataSource.java | 1 - .../java/androidx/media3/datasource/HttpEngineDataSource.java | 1 - .../androidx/media3/datasource/cronet/CronetDataSource.java | 1 - .../androidx/media3/datasource/okhttp/OkHttpDataSource.java | 1 - 6 files changed, 4 insertions(+), 5 deletions(-) diff --git a/api.txt b/api.txt index 5b21cb5cde..79c92db310 100644 --- a/api.txt +++ b/api.txt @@ -1265,6 +1265,7 @@ package androidx.media3.common.util { method public static boolean checkCleartextTrafficPermitted(androidx.media3.common.MediaItem...); method @Nullable public static String getAdaptiveMimeTypeForContentType(@androidx.media3.common.C.ContentType int); method @Nullable public static java.util.UUID getDrmUuid(String); + method public static String getUserAgent(android.content.Context, String); method public static boolean handlePauseButtonAction(@Nullable androidx.media3.common.Player); method public static boolean handlePlayButtonAction(@Nullable androidx.media3.common.Player); method public static boolean handlePlayPauseButtonAction(@Nullable androidx.media3.common.Player); @@ -1304,6 +1305,7 @@ package androidx.media3.datasource { public static final class DefaultHttpDataSource.Factory implements androidx.media3.datasource.HttpDataSource.Factory { ctor public DefaultHttpDataSource.Factory(); + method public androidx.media3.datasource.DefaultHttpDataSource.Factory setUserAgent(@Nullable String); } public interface HttpDataSource extends androidx.media3.datasource.DataSource { @@ -1344,6 +1346,7 @@ package androidx.media3.datasource.cronet { public static final class CronetDataSource.Factory implements androidx.media3.datasource.HttpDataSource.Factory { ctor public CronetDataSource.Factory(org.chromium.net.CronetEngine, java.util.concurrent.Executor); + method public androidx.media3.datasource.cronet.CronetDataSource.Factory setUserAgent(@Nullable String); } public final class CronetUtil { @@ -1359,6 +1362,7 @@ package androidx.media3.datasource.okhttp { public static final class OkHttpDataSource.Factory implements androidx.media3.datasource.HttpDataSource.Factory { ctor public OkHttpDataSource.Factory(okhttp3.Call.Factory); + method public androidx.media3.datasource.okhttp.OkHttpDataSource.Factory setUserAgent(@Nullable String); } } diff --git a/libraries/common/src/main/java/androidx/media3/common/util/Util.java b/libraries/common/src/main/java/androidx/media3/common/util/Util.java index f95067d1f8..19e21d2003 100644 --- a/libraries/common/src/main/java/androidx/media3/common/util/Util.java +++ b/libraries/common/src/main/java/androidx/media3/common/util/Util.java @@ -2075,7 +2075,6 @@ public final class Util { * @param applicationName String that will be prefix'ed to the generated user agent. * @return A user agent string generated using the applicationName and the library version. */ - @UnstableApi public static String getUserAgent(Context context, String applicationName) { String versionName; try { diff --git a/libraries/datasource/src/main/java/androidx/media3/datasource/DefaultHttpDataSource.java b/libraries/datasource/src/main/java/androidx/media3/datasource/DefaultHttpDataSource.java index e48fbb501c..5cc5766f74 100644 --- a/libraries/datasource/src/main/java/androidx/media3/datasource/DefaultHttpDataSource.java +++ b/libraries/datasource/src/main/java/androidx/media3/datasource/DefaultHttpDataSource.java @@ -103,7 +103,6 @@ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSou * @return This factory. */ @CanIgnoreReturnValue - @UnstableApi public Factory setUserAgent(@Nullable String userAgent) { this.userAgent = userAgent; return this; diff --git a/libraries/datasource/src/main/java/androidx/media3/datasource/HttpEngineDataSource.java b/libraries/datasource/src/main/java/androidx/media3/datasource/HttpEngineDataSource.java index 971d96f4c0..0ae12642ee 100644 --- a/libraries/datasource/src/main/java/androidx/media3/datasource/HttpEngineDataSource.java +++ b/libraries/datasource/src/main/java/androidx/media3/datasource/HttpEngineDataSource.java @@ -127,7 +127,6 @@ public final class HttpEngineDataSource extends BaseDataSource implements HttpDa * @return This factory. */ @CanIgnoreReturnValue - @UnstableApi public Factory setUserAgent(@Nullable String userAgent) { this.userAgent = userAgent; return this; diff --git a/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSource.java b/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSource.java index 34142b7eaa..437d727ad0 100644 --- a/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSource.java +++ b/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSource.java @@ -173,7 +173,6 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource { * @return This factory. */ @CanIgnoreReturnValue - @UnstableApi public Factory setUserAgent(@Nullable String userAgent) { this.userAgent = userAgent; if (internalFallbackFactory != null) { diff --git a/libraries/datasource_okhttp/src/main/java/androidx/media3/datasource/okhttp/OkHttpDataSource.java b/libraries/datasource_okhttp/src/main/java/androidx/media3/datasource/okhttp/OkHttpDataSource.java index 45d8ad706a..e493edd21e 100644 --- a/libraries/datasource_okhttp/src/main/java/androidx/media3/datasource/okhttp/OkHttpDataSource.java +++ b/libraries/datasource_okhttp/src/main/java/androidx/media3/datasource/okhttp/OkHttpDataSource.java @@ -112,7 +112,6 @@ public class OkHttpDataSource extends BaseDataSource implements HttpDataSource { * @return This factory. */ @CanIgnoreReturnValue - @UnstableApi public Factory setUserAgent(@Nullable String userAgent) { this.userAgent = userAgent; return this;