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

Commit 4e6dcbd0 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "AAudio player type."

parents 5b0f6c5b 8171de4a

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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

media/java/android/media/AudioPlaybackConfiguration.java

+2 −7
Original line number Diff line number Diff line
@@ -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;