diff options
| author | James Dong <jdong@google.com> | 2012-12-21 14:05:09 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-21 14:05:09 -0800 |
| commit | 5d5526aa86888cb0891f535823dc93e154f38b2e (patch) | |
| tree | e474c969786077da7da3269699ce6238e1df5505 /media/jni | |
| parent | c8db3b8ae34c76430e8e97418e485dedc44d0954 (diff) | |
| parent | 4526f0de0a5698832719f16158bed57ad209d4f2 (diff) | |
| download | frameworks_base-5d5526aa86888cb0891f535823dc93e154f38b2e.zip frameworks_base-5d5526aa86888cb0891f535823dc93e154f38b2e.tar.gz frameworks_base-5d5526aa86888cb0891f535823dc93e154f38b2e.tar.bz2 | |
Merge "Handle errors from AudioEffect::queryNumberEffects"
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/audioeffect/android_media_AudioEffect.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/jni/audioeffect/android_media_AudioEffect.cpp b/media/jni/audioeffect/android_media_AudioEffect.cpp index 3b325b7..bcab4f3 100644 --- a/media/jni/audioeffect/android_media_AudioEffect.cpp +++ b/media/jni/audioeffect/android_media_AudioEffect.cpp @@ -705,7 +705,7 @@ android_media_AudioEffect_native_queryEffects(JNIEnv *env, jclass clazz) { effect_descriptor_t desc; char str[EFFECT_STRING_LEN_MAX]; - uint32_t numEffects; + uint32_t numEffects = 0; uint32_t i = 0; jstring jdescType; jstring jdescUuid; @@ -714,7 +714,10 @@ android_media_AudioEffect_native_queryEffects(JNIEnv *env, jclass clazz) jstring jdescImplementor; jobject jdesc; - AudioEffect::queryNumberEffects(&numEffects); + if (AudioEffect::queryNumberEffects(&numEffects) != NO_ERROR) { + return NULL; + } + jobjectArray ret = env->NewObjectArray(numEffects, fields.clazzDesc, NULL); if (ret == NULL) { return ret; |