diff options
| author | Andy Hung <hunga@google.com> | 2015-05-20 23:01:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-20 23:01:39 +0000 |
| commit | b14b7e188fd1cc5215d2ac0c2a1c1588089712f1 (patch) | |
| tree | e6cd3f9fe9a971ccfd6efb5dcc711a6011aa2387 /api | |
| parent | d9b0c913f7dd1508b8d4b97d8b82ea23a5a9ca40 (diff) | |
| parent | e90a0a88f4eabdc27c3ef033f38c91ea23362a1e (diff) | |
| download | frameworks_base-b14b7e188fd1cc5215d2ac0c2a1c1588089712f1.zip frameworks_base-b14b7e188fd1cc5215d2ac0c2a1c1588089712f1.tar.gz frameworks_base-b14b7e188fd1cc5215d2ac0c2a1c1588089712f1.tar.bz2 | |
Merge "Fix AudioTrack, AudioRecord, AudioFormat API" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 9 | ||||
| -rw-r--r-- | api/system-current.txt | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/api/current.txt b/api/current.txt index e6ddd63..bbdb878 100644 --- a/api/current.txt +++ b/api/current.txt @@ -14801,8 +14801,8 @@ package android.media { ctor public AudioFormat.Builder(); ctor public AudioFormat.Builder(android.media.AudioFormat); method public android.media.AudioFormat build(); - method public android.media.AudioFormat.Builder setChannelIndexMask(int) throws java.lang.IllegalArgumentException; - method public android.media.AudioFormat.Builder setChannelMask(int) throws java.lang.IllegalArgumentException; + method public android.media.AudioFormat.Builder setChannelIndexMask(int); + method public android.media.AudioFormat.Builder setChannelMask(int); method public android.media.AudioFormat.Builder setEncoding(int) throws java.lang.IllegalArgumentException; method public android.media.AudioFormat.Builder setSampleRate(int) throws java.lang.IllegalArgumentException; } @@ -14964,11 +14964,11 @@ package android.media { method public int getAudioFormat(); method public int getAudioSessionId(); method public int getAudioSource(); + method public int getBufferSizeInFrames(); method public int getChannelConfiguration(); method public int getChannelCount(); method public android.media.AudioFormat getFormat(); method public static int getMinBufferSize(int, int, int); - method public int getNativeFrameCount() throws java.lang.IllegalStateException; method public int getNotificationMarkerPosition(); method public int getPositionNotificationPeriod(); method public android.media.AudioDeviceInfo getPreferredDevice(); @@ -15037,13 +15037,14 @@ package android.media { method public void flush(); method public int getAudioFormat(); method public int getAudioSessionId(); + method public int getBufferSizeInFrames(); method public int getChannelConfiguration(); method public int getChannelCount(); method public android.media.AudioFormat getFormat(); method public static float getMaxVolume(); method public static int getMinBufferSize(int, int, int); method public static float getMinVolume(); - method public int getNativeFrameCount() throws java.lang.IllegalStateException; + method protected deprecated int getNativeFrameCount(); method public static int getNativeOutputSampleRate(int); method public int getNotificationMarkerPosition(); method public int getPlayState(); diff --git a/api/system-current.txt b/api/system-current.txt index 93d7577..1a3673d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -16027,8 +16027,8 @@ package android.media { ctor public AudioFormat.Builder(); ctor public AudioFormat.Builder(android.media.AudioFormat); method public android.media.AudioFormat build(); - method public android.media.AudioFormat.Builder setChannelIndexMask(int) throws java.lang.IllegalArgumentException; - method public android.media.AudioFormat.Builder setChannelMask(int) throws java.lang.IllegalArgumentException; + method public android.media.AudioFormat.Builder setChannelIndexMask(int); + method public android.media.AudioFormat.Builder setChannelMask(int); method public android.media.AudioFormat.Builder setEncoding(int) throws java.lang.IllegalArgumentException; method public android.media.AudioFormat.Builder setSampleRate(int) throws java.lang.IllegalArgumentException; } @@ -16200,11 +16200,11 @@ package android.media { method public int getAudioFormat(); method public int getAudioSessionId(); method public int getAudioSource(); + method public int getBufferSizeInFrames(); method public int getChannelConfiguration(); method public int getChannelCount(); method public android.media.AudioFormat getFormat(); method public static int getMinBufferSize(int, int, int); - method public int getNativeFrameCount() throws java.lang.IllegalStateException; method public int getNotificationMarkerPosition(); method public int getPositionNotificationPeriod(); method public android.media.AudioDeviceInfo getPreferredDevice(); @@ -16275,13 +16275,14 @@ package android.media { method public void flush(); method public int getAudioFormat(); method public int getAudioSessionId(); + method public int getBufferSizeInFrames(); method public int getChannelConfiguration(); method public int getChannelCount(); method public android.media.AudioFormat getFormat(); method public static float getMaxVolume(); method public static int getMinBufferSize(int, int, int); method public static float getMinVolume(); - method public int getNativeFrameCount() throws java.lang.IllegalStateException; + method protected deprecated int getNativeFrameCount(); method public static int getNativeOutputSampleRate(int); method public int getNotificationMarkerPosition(); method public int getPlayState(); |