loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stabilize various setUserAgent() and Util.getUserAgent() methods

Browse Source 
Issue: androidx/media#2286
PiperOrigin-RevId: 742367539
This commit is contained in:
ibaker 2025-03-31 13:03:45 -07:00 committed by Copybara-Service
parent 8508e12001
commit 3ab484d93f
6 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api.txt
View File

@ -1265,6 +1265,7 @@ package androidx.media3.common.util {
method public static boolean checkCleartextTrafficPermitted(androidx.media3.common.MediaItem...); 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 String getAdaptiveMimeTypeForContentType(@androidx.media3.common.C.ContentType int);
method @Nullable public static java.util.UUID getDrmUuid(String); 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 handlePauseButtonAction(@Nullable androidx.media3.common.Player);
method public static boolean handlePlayButtonAction(@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); 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 { public static final class DefaultHttpDataSource.Factory implements androidx.media3.datasource.HttpDataSource.Factory {
ctor public DefaultHttpDataSource.Factory(); ctor public DefaultHttpDataSource.Factory();
method public androidx.media3.datasource.DefaultHttpDataSource.Factory setUserAgent(@Nullable String);
} }
public interface HttpDataSource extends androidx.media3.datasource.DataSource { 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 { public static final class CronetDataSource.Factory implements androidx.media3.datasource.HttpDataSource.Factory {
ctor public CronetDataSource.Factory(org.chromium.net.CronetEngine, java.util.concurrent.Executor); 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 { 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 { public static final class OkHttpDataSource.Factory implements androidx.media3.datasource.HttpDataSource.Factory {
ctor public OkHttpDataSource.Factory(okhttp3.Call.Factory); ctor public OkHttpDataSource.Factory(okhttp3.Call.Factory);
method public androidx.media3.datasource.okhttp.OkHttpDataSource.Factory setUserAgent(@Nullable String);
} }
} }

1
libraries/common/src/main/java/androidx/media3/common/util/Util.java
View File

@ -2075,7 +2075,6 @@ public final class Util {
* @param applicationName String that will be prefix'ed to the generated user agent. * @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. * @return A user agent string generated using the applicationName and the library version.
*/ */
@UnstableApi
public static String getUserAgent(Context context, String applicationName) { public static String getUserAgent(Context context, String applicationName) {
String versionName; String versionName;
try { try {

1
libraries/datasource/src/main/java/androidx/media3/datasource/DefaultHttpDataSource.java
View File

@ -103,7 +103,6 @@ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSou
* @return This factory. * @return This factory.
*/ */
@CanIgnoreReturnValue @CanIgnoreReturnValue
@UnstableApi
public Factory setUserAgent(@Nullable String userAgent) { public Factory setUserAgent(@Nullable String userAgent) {
this.userAgent = userAgent; this.userAgent = userAgent;
return this; return this;

1
libraries/datasource/src/main/java/androidx/media3/datasource/HttpEngineDataSource.java
View File

@ -127,7 +127,6 @@ public final class HttpEngineDataSource extends BaseDataSource implements HttpDa
* @return This factory. * @return This factory.
*/ */
@CanIgnoreReturnValue @CanIgnoreReturnValue
@UnstableApi
public Factory setUserAgent(@Nullable String userAgent) { public Factory setUserAgent(@Nullable String userAgent) {
this.userAgent = userAgent; this.userAgent = userAgent;
return this; return this;

1
libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSource.java
View File

@ -173,7 +173,6 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
* @return This factory. * @return This factory.
*/ */
@CanIgnoreReturnValue @CanIgnoreReturnValue
@UnstableApi
public Factory setUserAgent(@Nullable String userAgent) { public Factory setUserAgent(@Nullable String userAgent) {
this.userAgent = userAgent; this.userAgent = userAgent;
if (internalFallbackFactory != null) { if (internalFallbackFactory != null) {

1
libraries/datasource_okhttp/src/main/java/androidx/media3/datasource/okhttp/OkHttpDataSource.java
View File

@ -112,7 +112,6 @@ public class OkHttpDataSource extends BaseDataSource implements HttpDataSource {
* @return This factory. * @return This factory.
*/ */
@CanIgnoreReturnValue @CanIgnoreReturnValue
@UnstableApi
public Factory setUserAgent(@Nullable String userAgent) { public Factory setUserAgent(@Nullable String userAgent) {
this.userAgent = userAgent; this.userAgent = userAgent;
return this; return this;