diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 35cade522..349efb02c 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -1341,3 +1341,13 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCallImpl_isAuthenticationToke
 extern "C" jboolean Java_org_linphone_core_LinphoneCallImpl_areStreamsEncrypted(JNIEnv*  env,jobject thiz,jlong ptr) {
 	return linphone_call_are_all_streams_encrypted((LinphoneCall *) ptr);
 }
+
+// Needed by Galaxy S (can't switch to/from speaker while playing and still keep mic working)
+// Implemented directly in msandroid.cpp (sound filters for Android).
+extern "C" void msandroid_hack_speaker_state(bool speakerOn);
+
+extern "C" void Java_org_linphone_LinphoneManager_hackSpeakerState(JNIEnv*  env,jobject thiz,jboolean speakerOn){
+	msandroid_hack_speaker_state(speakerOn);
+// End Galaxy S hack functions
+}
+
diff --git a/mediastreamer2 b/mediastreamer2
index 813dd63dc..57319ab67 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 813dd63dc151d4202c3f52f3eab9f6d880bfc19b
+Subproject commit 57319ab677c00e43b576b4204df870074a9216f6