loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up MediaConstants

Browse Source 
PiperOrigin-RevId: 445219759
This commit is contained in:
bachinger 2022-04-28 20:30:02 +01:00 committed by Ian Baker
parent e7e466f729
commit fdd5bcdf5b
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libraries/session/src/main/java/androidx/media3/session/MediaConstants.java
View File

@ -16,6 +16,8 @@
package androidx.media3.session; package androidx.media3.session;
import android.net.Uri; import android.net.Uri;
import android.support.v4.media.session.PlaybackStateCompat;
import androidx.media3.session.MediaLibraryService.LibraryParams;
/** Constants that can be shared between media session and controller. */ /** Constants that can be shared between media session and controller. */
public final class MediaConstants { public final class MediaConstants {
@ -116,27 +118,36 @@ public final class MediaConstants {
/** /**
* The extras key for the localized error resolution string. * The extras key for the localized error resolution string.
* *
* <p>See {@link * <p>Use this key to populate the extras bundle of the {@link LibraryParams} when {@link
* androidx.media.utils.MediaConstants#PLAYBACK_STATE_EXTRAS_KEY_ERROR_RESOLUTION_ACTION_LABEL}. * LibraryResult#ofError(int, LibraryParams) creating a LibraryResult} for an unsuccessful service
* call.
*
* @see
* androidx.media.utils.MediaConstants#PLAYBACK_STATE_EXTRAS_KEY_ERROR_RESOLUTION_ACTION_LABEL
*/ */
public static final String EXTRAS_KEY_ERROR_RESOLUTION_ACTION_LABEL_COMPAT = public static final String EXTRAS_KEY_ERROR_RESOLUTION_ACTION_LABEL_COMPAT =
"android.media.extras.ERROR_RESOLUTION_ACTION_LABEL"; "android.media.extras.ERROR_RESOLUTION_ACTION_LABEL";
/** /**
* The extras key for the error resolution intent. * The extras key for the error resolution intent.
* *
* <p>See {@link * <p>Use this key to populate the extras bundle of the {@link LibraryParams} when {@link
* androidx.media.utils.MediaConstants#PLAYBACK_STATE_EXTRAS_KEY_ERROR_RESOLUTION_ACTION_INTENT}. * LibraryResult#ofError(int, LibraryParams) creating a LibraryResult} for an unsuccessful service
* call.
*
* @see
* androidx.media.utils.MediaConstants#PLAYBACK_STATE_EXTRAS_KEY_ERROR_RESOLUTION_ACTION_INTENT
*/ */
public static final String EXTRAS_KEY_ERROR_RESOLUTION_ACTION_INTENT_COMPAT = public static final String EXTRAS_KEY_ERROR_RESOLUTION_ACTION_INTENT_COMPAT =
"android.media.extras.ERROR_RESOLUTION_ACTION_INTENT"; "android.media.extras.ERROR_RESOLUTION_ACTION_INTENT";
/** The legacy status code for successful execution. */
public static final int STATUS_CODE_SUCCESS_COMPAT = -1;
/** /**
* The legacy error code for expired authentication. * The legacy error code for expired authentication.
* *
* <p>See {@code PlaybackStateCompat#ERROR_CODE_AUTHENTICATION_EXPIRED}. * <p>Use this error code to indicate an expired authentication when {@link
* LibraryResult#ofError(int, LibraryParams) creating a LibraryResult} for an unsuccessful service
* call.
*
* @see PlaybackStateCompat#ERROR_CODE_AUTHENTICATION_EXPIRED
*/ */
public static final int ERROR_CODE_AUTHENTICATION_EXPIRED_COMPAT = 3; public static final int ERROR_CODE_AUTHENTICATION_EXPIRED_COMPAT = 3;

3
libraries/session/src/main/java/androidx/media3/session/PlayerWrapper.java
View File

@ -18,7 +18,6 @@ package androidx.media3.session;
import static androidx.media3.common.util.Assertions.checkNotNull; import static androidx.media3.common.util.Assertions.checkNotNull;
import static androidx.media3.common.util.Assertions.checkState; import static androidx.media3.common.util.Assertions.checkState;
import static androidx.media3.common.util.Util.postOrRun; import static androidx.media3.common.util.Util.postOrRun;
import static androidx.media3.session.MediaConstants.STATUS_CODE_SUCCESS_COMPAT;
import android.media.AudioManager; import android.media.AudioManager;
import android.os.Bundle; import android.os.Bundle;
@ -55,6 +54,8 @@ import java.util.List;
*/ */
/* package */ class PlayerWrapper extends ForwardingPlayer { /* package */ class PlayerWrapper extends ForwardingPlayer {
private static final int STATUS_CODE_SUCCESS_COMPAT = -1;
private int legacyStatusCode; private int legacyStatusCode;
@Nullable private String legacyErrorMessage; @Nullable private String legacyErrorMessage;
@Nullable private Bundle legacyErrorExtras; @Nullable private Bundle legacyErrorExtras;