Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MediaRouter: Add features to distinguish audio routes

Browse Source 
This CL adds more route features to give
media apps more information.
It also clarifies the values of pre defined route features.

Bug: 152024707
Test: cts test and mediaroutertest

Change-Id: Ia89b45191c4f3fe23210aaca7f336637725fe3b3
This commit is contained in:
Kyunglyul Hyun
2020-03-20 22:19:21 +09:00
parent 8c224313f7
commit c19b3cc14a
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/current.txt
View File

@@ -26878,9 +26878,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
}

34
media/java/android/media/MediaRoute2Info.java
View File

@@ -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;