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

Merge "AAudio player type."

Browse Source
This commit is contained in:
Jean-Michel Trivi
2020-12-08 16:27:51 +00:00
committed by Android (Google) Code Review
parent 5b0f6c5b26 8171de4a43
commit 4e6dcbd017
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -4370,6 +4370,7 @@ package android.media {
field public static final int PLAYER_STATE_STARTED = 2; // 0x2
field public static final int PLAYER_STATE_STOPPED = 4; // 0x4
field public static final int PLAYER_STATE_UNKNOWN = -1; // 0xffffffff
field public static final int PLAYER_TYPE_AAUDIO = 13; // 0xd
field public static final int PLAYER_TYPE_JAM_AUDIOTRACK = 1; // 0x1
field public static final int PLAYER_TYPE_JAM_MEDIAPLAYER = 2; // 0x2
field public static final int PLAYER_TYPE_JAM_SOUNDPOOL = 3; // 0x3

9
media/java/android/media/AudioPlaybackConfiguration.java
View File

@@ -89,9 +89,8 @@ public final class AudioPlaybackConfiguration implements Parcelable {
/**
* @hide
* Player backed an AAudio player.
* Note this type is not in System API so it will not be returned in public API calls
*/
// TODO unhide for SystemApi, update getPlayerType()
@SystemApi
public static final int PLAYER_TYPE_AAUDIO = 13;
/**
@@ -280,10 +279,7 @@ public final class AudioPlaybackConfiguration implements Parcelable {
/**
* @hide
* Return the type of player linked to this configuration. The return value is one of
* {@link #PLAYER_TYPE_JAM_AUDIOTRACK}, {@link #PLAYER_TYPE_JAM_MEDIAPLAYER},
* {@link #PLAYER_TYPE_JAM_SOUNDPOOL}, {@link #PLAYER_TYPE_SLES_AUDIOPLAYER_BUFFERQUEUE},
* {@link #PLAYER_TYPE_SLES_AUDIOPLAYER_URI_FD}, or {@link #PLAYER_TYPE_UNKNOWN}.
* Return the type of player linked to this configuration.
* <br>Note that player types not exposed in the system API will be represented as
* {@link #PLAYER_TYPE_UNKNOWN}.
* @return the type of the player.
@@ -291,7 +287,6 @@ public final class AudioPlaybackConfiguration implements Parcelable {
@SystemApi
public @PlayerType int getPlayerType() {
switch (mPlayerType) {
case PLAYER_TYPE_AAUDIO:
case PLAYER_TYPE_HW_SOURCE:
case PLAYER_TYPE_EXTERNAL_PROXY:
return PLAYER_TYPE_UNKNOWN;