summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAndy Hung <hunga@google.com>2015-04-17 19:51:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-17 19:51:36 +0000
commite354f5d5806c1566761e03fbdf5a46a723d6ebd3 (patch)
treeb982bc22f70753ee2b8cc2dc54886342e3cff4e3 /api
parent5e4b823aa04aaaf78349d4e6f0f45077e83702ab (diff)
parent0e9e2f3724b43f86bb7e41a40e665587730ce6ae (diff)
downloadframeworks_base-e354f5d5806c1566761e03fbdf5a46a723d6ebd3.zip
frameworks_base-e354f5d5806c1566761e03fbdf5a46a723d6ebd3.tar.gz
frameworks_base-e354f5d5806c1566761e03fbdf5a46a723d6ebd3.tar.bz2
Merge "Add non-blocking reads to AudioRecord"
Diffstat (limited to 'api')
-rw-r--r--api/current.txt3
-rw-r--r--api/system-current.txt3
2 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 5f4d6e9..6f2cf45 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -14910,9 +14910,12 @@ package android.media {
method public int getSampleRate();
method public int getState();
method public int read(byte[], int, int);
+ method public int read(byte[], int, int, int);
method public int read(short[], int, int);
+ method public int read(short[], int, int, int);
method public int read(float[], int, int, int);
method public int read(java.nio.ByteBuffer, int);
+ method public int read(java.nio.ByteBuffer, int, int);
method public void release();
method public int setNotificationMarkerPosition(int);
method public int setPositionNotificationPeriod(int);
diff --git a/api/system-current.txt b/api/system-current.txt
index e44ee6e..b853a38 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -16120,9 +16120,12 @@ package android.media {
method public int getSampleRate();
method public int getState();
method public int read(byte[], int, int);
+ method public int read(byte[], int, int, int);
method public int read(short[], int, int);
+ method public int read(short[], int, int, int);
method public int read(float[], int, int, int);
method public int read(java.nio.ByteBuffer, int);
+ method public int read(java.nio.ByteBuffer, int, int);
method public void release();
method public int setNotificationMarkerPosition(int);
method public int setPositionNotificationPeriod(int);