From b4b5518c81c54c749a0d82a27249b47b855c308e Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Wed, 29 Oct 2014 20:34:15 +0000 Subject: Fix android_media_AudioSystem_getMasterMute return type. Caused FPU stack overflow on x86. Bug: 18023418 (cherry picked from commit c1bcdbb75877d99972f1cd13a9c40126822621bc) Change-Id: Ia1b5a1da52b20c2e0a84321e784cd795ec649e66 --- core/jni/android_media_AudioSystem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.3-59-g8ed1b