summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2015-07-02 12:09:44 -0700
committerEric Laurent <elaurent@google.com>2015-08-27 17:52:38 +0000
commit4a8034caea13a90c01800ff554539772c6ff5523 (patch)
tree26a1c2a9afb89012e777b19d00ae4b07752c26cd /core/jni
parent258b56ec58fca2b740bcfe9a2af81f0f59a14abb (diff)
downloadframeworks_base-4a8034caea13a90c01800ff554539772c6ff5523.zip
frameworks_base-4a8034caea13a90c01800ff554539772c6ff5523.tar.gz
frameworks_base-4a8034caea13a90c01800ff554539772c6ff5523.tar.bz2
AudioTrack: error reporting for getTimestamp()
Add a new getTimestamp() method that returns an error code. Bug: 21886109. Bug: 22202349. Bug: 17548098. Change-Id: Ib072dd3442de79bab9aca77c3c33b0790b492154 (cherry picked from commit 4e1ccd370fc268f3207c5baee08ac8c943c3fdf9)
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/android_media_AudioErrors.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/jni/android_media_AudioErrors.h b/core/jni/android_media_AudioErrors.h
index 4907830..c17a020 100644
--- a/core/jni/android_media_AudioErrors.h
+++ b/core/jni/android_media_AudioErrors.h
@@ -32,6 +32,7 @@ enum {
AUDIO_JAVA_PERMISSION_DENIED = -4,
AUDIO_JAVA_NO_INIT = -5,
AUDIO_JAVA_DEAD_OBJECT = -6,
+ AUDIO_JAVA_WOULD_BLOCK = -7,
};
static inline jint nativeToJavaStatus(status_t status) {
@@ -46,6 +47,8 @@ static inline jint nativeToJavaStatus(status_t status) {
return AUDIO_JAVA_PERMISSION_DENIED;
case NO_INIT:
return AUDIO_JAVA_NO_INIT;
+ case WOULD_BLOCK:
+ return AUDIO_JAVA_WOULD_BLOCK;
case DEAD_OBJECT:
return AUDIO_JAVA_DEAD_OBJECT;
default: