diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 526bd9459..c468db92b 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -1216,7 +1216,9 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_needsEchoCalibration
 		ms_error("Could not get soundcard.");
 		return TRUE;
 	}
-	return (ms_snd_card_get_capabilities(sndcard) & MS_SND_CARD_CAP_BUILTIN_ECHO_CANCELLER) || (ms_snd_card_get_minimal_latency(sndcard)>0);
+	if (ms_snd_card_get_capabilities(sndcard) & MS_SND_CARD_CAP_BUILTIN_ECHO_CANCELLER) return FALSE;
+	if (ms_snd_card_get_minimal_latency(sndcard)==0) return TRUE;
+	return FALSE;
 }
 
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getMediaEncryption(JNIEnv*  env
diff --git a/mediastreamer2 b/mediastreamer2
index 6c2a60880..6a35ffc77 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 6c2a608800a221942f2a827e0abb60346e7d065f
+Subproject commit 6a35ffc7745d6748a43cebd7347f6af89a913593