Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae5b29f6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "MediaRouter: Add features to distinguish audio routes" into rvc-dev

parents eb0d8bff c19b3cc1

api/current.txt

+5 −3
Original line number Diff line number Diff line
@@ -26870,9 +26870,11 @@ package android.media { 
    field public static final int CONNECTION_STATE_CONNECTING = 1; // 0x1

    field public static final int CONNECTION_STATE_DISCONNECTED = 0; // 0x0

    field @NonNull public static final android.os.Parcelable.Creator<android.media.MediaRoute2Info> CREATOR;

    field public static final String FEATURE_LIVE_AUDIO = "android.media.intent.category.LIVE_AUDIO";

    field public static final String FEATURE_LIVE_VIDEO = "android.media.intent.category.LIVE_VIDEO";

    field public static final String FEATURE_REMOTE_PLAYBACK = "android.media.intent.category.REMOTE_PLAYBACK";

    field public static final String FEATURE_LIVE_AUDIO = "android.media.route.feature.LIVE_AUDIO";

    field public static final String FEATURE_LIVE_VIDEO = "android.media.route.feature.LIVE_VIDEO";

    field public static final String FEATURE_REMOTE_AUDIO_PLAYBACK = "android.media.route.feature.REMOTE_AUDIO_PLAYBACK";

    field public static final String FEATURE_REMOTE_PLAYBACK = "android.media.route.feature.REMOTE_PLAYBACK";

    field public static final String FEATURE_REMOTE_VIDEO_PLAYBACK = "android.media.route.feature.REMOTE_VIDEO_PLAYBACK";

    field public static final int PLAYBACK_VOLUME_FIXED = 0; // 0x0

    field public static final int PLAYBACK_VOLUME_VARIABLE = 1; // 0x1

  }

media/java/android/media/MediaRoute2Info.java

+31 −3
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ public final class MediaRoute2Info implements Parcelable { 
     * Refer to the class documentation for details about live audio routes.

     * </p>

     */

    public static final String FEATURE_LIVE_AUDIO = "android.media.intent.category.LIVE_AUDIO";

    public static final String FEATURE_LIVE_AUDIO = "android.media.route.feature.LIVE_AUDIO";



    /**

     * Media feature: Live video.
@@ -259,13 +259,15 @@ public final class MediaRoute2Info implements Parcelable { 
     *

     * @see android.app.Presentation

     */

    public static final String FEATURE_LIVE_VIDEO = "android.media.intent.category.LIVE_VIDEO";

    public static final String FEATURE_LIVE_VIDEO = "android.media.route.feature.LIVE_VIDEO";



    /**

     * Media feature: Remote playback.

     * <p>

     * A route that supports remote playback routing will allow an application to send

     * requests to play content remotely to supported destinations.

     * A route may only support {@link #FEATURE_REMOTE_AUDIO_PLAYBACK audio playback} or

     * {@link #FEATURE_REMOTE_VIDEO_PLAYBACK video playback}.

     * </p><p>

     * Remote playback routes destinations operate independently of the local device.

     * When a remote playback route is selected, the application can control the content
@@ -274,9 +276,35 @@ public final class MediaRoute2Info implements Parcelable { 
     * </p><p>

     * Refer to the class documentation for details about remote playback routes.

     * </p>

     * @see #FEATURE_REMOTE_AUDIO_PLAYBACK

     * @see #FEATURE_REMOTE_VIDEO_PLAYBACK

     */

    public static final String FEATURE_REMOTE_PLAYBACK =

            "android.media.intent.category.REMOTE_PLAYBACK";

            "android.media.route.feature.REMOTE_PLAYBACK";



    /**

     * Media feature: Remote audio playback.

     * <p>

     * A route that supports remote audio playback routing will allow an application to send

     * requests to play audio content remotely to supported destinations.

     *

     * @see #FEATURE_REMOTE_PLAYBACK

     * @see #FEATURE_REMOTE_VIDEO_PLAYBACK

     */

    public static final String FEATURE_REMOTE_AUDIO_PLAYBACK =

            "android.media.route.feature.REMOTE_AUDIO_PLAYBACK";



    /**

     * Media feature: Remote video playback.

     * <p>

     * A route that supports remote video playback routing will allow an application to send

     * requests to play video content remotely to supported destinations.

     *

     * @see #FEATURE_REMOTE_PLAYBACK

     * @see #FEATURE_REMOTE_AUDIO_PLAYBACK

     */

    public static final String FEATURE_REMOTE_VIDEO_PLAYBACK =

            "android.media.route.feature.REMOTE_VIDEO_PLAYBACK";



    final String mId;

    final CharSequence mName;