am 85d6f299: Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev

* commit '85d6f299943017f939ecfee9708f10b4e5fddd3e':
  Fix android_media_AudioSystem_getMasterMute return type.
This commit is contained in:
Vladimir Marko
2014-10-29 22:55:04 +00:00
committed by Android Git Automerger

View File

@@ -390,7 +390,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;