summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2014-10-29 20:34:15 +0000
committer Vladimir Marko <vmarko@google.com> 2014-10-29 21:18:00 +0000
commitb4b5518c81c54c749a0d82a27249b47b855c308e (patch)
treeba81d8c79b7a67d562181db71af3fad3923135a3
parent43a9264619e08f464dd4f184e53441a440cca09f (diff)
Fix android_media_AudioSystem_getMasterMute return type.
Caused FPU stack overflow on x86. Bug: 18023418 (cherry picked from commit c1bcdbb75877d99972f1cd13a9c40126822621bc) Change-Id: Ia1b5a1da52b20c2e0a84321e784cd795ec649e66
-rw-r--r--core/jni/android_media_AudioSystem.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp
index 42feab4e3a49..961054f27cf4 100644
--- a/core/jni/android_media_AudioSystem.cpp
+++ b/core/jni/android_media_AudioSystem.cpp
@@ -232,7 +232,7 @@ android_media_AudioSystem_setMasterMute(JNIEnv *env, jobject thiz, jboolean mute
return (jint) check_AudioSystem_Command(AudioSystem::setMasterMute(mute));
}
-static jfloat
+static jboolean
android_media_AudioSystem_getMasterMute(JNIEnv *env, jobject thiz)
{
bool mute;