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

Commit c17a2423 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

AudioDeviceInfo: make TYPE_REMOTE_SUBMIX public 

SUBMIX type can be returned by routing query APIs such as
MediaPlayer.getRoutedDevice(), make it public.

Bug: 160819170
Test: atest AudioHostTest#testTwoChannelCapturingCheckSubmixDevice
Change-Id: Ie5854ad86464c40137d0a1b10420116bc5cc270e
parent 568afcc4

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -24079,6 +24079,7 @@ package android.media { 
    field public static final int TYPE_IP = 20; // 0x14

    field public static final int TYPE_LINE_ANALOG = 5; // 0x5

    field public static final int TYPE_LINE_DIGITAL = 6; // 0x6

    field public static final int TYPE_REMOTE_SUBMIX = 25; // 0x19

    field public static final int TYPE_TELEPHONY = 18; // 0x12

    field public static final int TYPE_TV_TUNER = 17; // 0x11

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

api/system-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -4172,10 +4172,6 @@ package android.media { 
    field public static final int ROLE_OUTPUT = 2; // 0x2

  }













  public final class AudioDeviceInfo {













    field public static final int TYPE_REMOTE_SUBMIX = 25; // 0x19













  }



























  public final class AudioFocusInfo implements android.os.Parcelable {















    method public int describeContents();















    method @NonNull public android.media.AudioAttributes getAttributes();

































media/java/android/media/AudioDeviceInfo.java



+8
−7




























Original line number
Diff line number
Diff line








@@ -18,7 +18,6 @@ package android.media;





























import android.annotation.IntDef;















import android.annotation.NonNull;













import android.annotation.SystemApi;















import android.util.SparseIntArray;































import java.lang.annotation.Retention;










@@ -137,13 +136,15 @@ public final class AudioDeviceInfo {













     */















    public static final int TYPE_BUILTIN_SPEAKER_SAFE = 24;















    /**













     * @hide















     * A device type for rerouting audio within the Android framework between mixes and













     * system applications. Typically created when using













     * {@link android.media.audiopolicy.AudioPolicy} for mixes created with the













     * {@link android.media.audiopolicy.AudioMix#ROUTE_FLAG_RENDER} flag.













     */













    @SystemApi













     * system applications.













     * This type is for instance encountered when querying the output device of a track













     * (with {@link AudioTrack#getRoutedDevice()} playing from a device in screen mirroring mode,













     * where the audio is not heard on the device, but on the remote device.













     */













    // Typically created when using













    // {@link android.media.audiopolicy.AudioPolicy} for mixes created with the













    // {@link android.media.audiopolicy.AudioMix#ROUTE_FLAG_LOOP_BACK} flag.















    public static final int TYPE_REMOTE_SUBMIX = 25;































    /** @hide */

































non-updatable-api/current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -24061,6 +24061,7 @@ package android.media {













    field public static final int TYPE_IP = 20; // 0x14















    field public static final int TYPE_LINE_ANALOG = 5; // 0x5















    field public static final int TYPE_LINE_DIGITAL = 6; // 0x6













    field public static final int TYPE_REMOTE_SUBMIX = 25; // 0x19















    field public static final int TYPE_TELEPHONY = 18; // 0x12















    field public static final int TYPE_TV_TUNER = 17; // 0x11















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

























non-updatable-api/system-current.txt



+0
−4




























Original line number
Diff line number
Diff line








@@ -4112,10 +4112,6 @@ package android.media {













    field public static final int ROLE_OUTPUT = 2; // 0x2















  }



























  public final class AudioDeviceInfo {













    field public static final int TYPE_REMOTE_SUBMIX = 25; // 0x19













  }



























  public final class AudioFocusInfo implements android.os.Parcelable {















    method public int describeContents();















    method @NonNull public android.media.AudioAttributes getAttributes();