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

Commit 988c72fb authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "AudioSystem: add annotation on API used by CTS media" into rvc-dev am:... 

Merge "AudioSystem: add annotation on API used by CTS media" into rvc-dev am: 3b13f5ef am: 72633a60

Change-Id: I5eceae4b02187281ce098cf6284254219304d915
parents 72f5f22b 72633a60

api/test-current.txt

+7 −0
Original line number Original line Diff line number Diff line
@@ -1504,6 +1504,13 @@ package android.media { 
    ctor public AudioRecordingConfiguration(int, int, int, android.media.AudioFormat, android.media.AudioFormat, int, String);

    ctor public AudioRecordingConfiguration(int, int, int, android.media.AudioFormat, android.media.AudioFormat, int, String);

  }

  }





  public class AudioSystem {

    method public static float getMasterBalance();

    method public static final int getNumStreamTypes();

    method public static int setMasterBalance(float);

    field public static final int STREAM_DEFAULT = -1; // 0xffffffff

  }



  public static final class AudioTrack.MetricsConstants {

  public static final class AudioTrack.MetricsConstants {

    field public static final String ATTRIBUTES = "android.media.audiotrack.attributes";

    field public static final String ATTRIBUTES = "android.media.audiotrack.attributes";

    field public static final String CHANNEL_MASK = "android.media.audiotrack.channelMask";

    field public static final String CHANNEL_MASK = "android.media.audiotrack.channelMask";

media/java/android/media/AudioSystem.java

+335 −140

File changed.

Preview size limit exceeded, changes collapsed.