diff options
| author | Vladimir Marko <vmarko@google.com> | 2014-10-29 21:57:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-29 21:57:16 +0000 |
| commit | 548101cb96fbc855d4257d46841b2959fe4c9ce4 (patch) | |
| tree | 4104cfcaae66626de10b1fcde87fd23d26430406 /core/jni | |
| parent | 5d5e4b14f67903370a7805492eb92fbe3b487a14 (diff) | |
| parent | e5fe7f3f4069b176a0465617dceb630a52b710c0 (diff) | |
| download | frameworks_base-548101cb96fbc855d4257d46841b2959fe4c9ce4.zip frameworks_base-548101cb96fbc855d4257d46841b2959fe4c9ce4.tar.gz frameworks_base-548101cb96fbc855d4257d46841b2959fe4c9ce4.tar.bz2 | |
am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type."
* commit 'e5fe7f3f4069b176a0465617dceb630a52b710c0':
Fix android_media_AudioSystem_getMasterMute return type.
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_media_AudioSystem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index 33bb90bc..f099289 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -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; |