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

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

Merge "Publish new route types"

parents 56958db4 476aa58a

core/api/current.txt

+6 −0
Original line number Diff line number Diff line
@@ -24333,7 +24333,13 @@ package android.media { 
    field public static final int TYPE_HDMI = 9; // 0x9

    field public static final int TYPE_HEARING_AID = 23; // 0x17

    field public static final int TYPE_REMOTE_AUDIO_VIDEO_RECEIVER = 1003; // 0x3eb

    field public static final int TYPE_REMOTE_CAR = 1008; // 0x3f0

    field public static final int TYPE_REMOTE_COMPUTER = 1006; // 0x3ee

    field public static final int TYPE_REMOTE_GAME_CONSOLE = 1007; // 0x3ef

    field public static final int TYPE_REMOTE_SMARTWATCH = 1009; // 0x3f1

    field public static final int TYPE_REMOTE_SPEAKER = 1002; // 0x3ea

    field public static final int TYPE_REMOTE_TABLET = 1004; // 0x3ec

    field public static final int TYPE_REMOTE_TABLET_DOCKED = 1005; // 0x3ed

    field public static final int TYPE_REMOTE_TV = 1001; // 0x3e9

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

    field public static final int TYPE_USB_ACCESSORY = 12; // 0xc

media/java/android/media/MediaRoute2Info.java

+6 −14
Original line number Diff line number Diff line
@@ -259,7 +259,6 @@ public final class MediaRoute2Info implements Parcelable { 
     * routing being done by the system.

     *

     * @see #getType

     * @hide

     */

    public static final int TYPE_REMOTE_TABLET = 1004;
@@ -270,7 +269,6 @@ public final class MediaRoute2Info implements Parcelable { 
     * routing being done by the system.

     *

     * @see #getType

     * @hide

     */

    public static final int TYPE_REMOTE_TABLET_DOCKED = 1005;
@@ -281,7 +279,6 @@ public final class MediaRoute2Info implements Parcelable { 
     * routing being done by the system.

     *

     * @see #getType

     * @hide

     */

    public static final int TYPE_REMOTE_COMPUTER = 1006;
@@ -292,7 +289,6 @@ public final class MediaRoute2Info implements Parcelable { 
     * routing being done by the system.

     *

     * @see #getType

     * @hide

     */

    public static final int TYPE_REMOTE_GAME_CONSOLE = 1007;
@@ -303,7 +299,6 @@ public final class MediaRoute2Info implements Parcelable { 
     * routing being done by the system.

     *

     * @see #getType

     * @hide

     */

    public static final int TYPE_REMOTE_CAR = 1008;
@@ -314,7 +309,6 @@ public final class MediaRoute2Info implements Parcelable { 
     * routing being done by the system.

     *

     * @see #getType

     * @hide

     */

    public static final int TYPE_REMOTE_SMARTWATCH = 1009;
@@ -522,14 +516,6 @@ public final class MediaRoute2Info implements Parcelable { 
        return mFeatures;

    }



    // TODO (b/278728942): Add the following once the symbols are published in the SDK. Until then,

    //     adding them would cause the generated link to be broken.

    //     @see #TYPE_REMOTE_TABLET

    //     @see #TYPE_REMOTE_TABLET_DOCKED

    //     @see #TYPE_REMOTE_COMPUTER

    //     @see #TYPE_REMOTE_GAME_CONSOLE

    //     @see #TYPE_REMOTE_CAR

    //     @see #TYPE_REMOTE_SMARTWATCH

    /**

     * Returns the type of this route.

     *
@@ -547,6 +533,12 @@ public final class MediaRoute2Info implements Parcelable { 
     * @see #TYPE_REMOTE_TV

     * @see #TYPE_REMOTE_SPEAKER

     * @see #TYPE_REMOTE_AUDIO_VIDEO_RECEIVER

     * @see #TYPE_REMOTE_TABLET

     * @see #TYPE_REMOTE_TABLET_DOCKED

     * @see #TYPE_REMOTE_COMPUTER

     * @see #TYPE_REMOTE_GAME_CONSOLE

     * @see #TYPE_REMOTE_CAR

     * @see #TYPE_REMOTE_SMARTWATCH

     * @see #TYPE_GROUP

     */

    @Type