Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

build/android/Android.mk

@@ -53,7 +53,7 @@ LOCAL_CFLAGS += \
 	-D_BYTE_ORDER=_LITTLE_ENDIAN \
 	-DORTP_INET6 \
 	-DENABLE_TRACE \
-	-DLINPHONE_VERSION=\"Linphone-3.3.x\" \
+	-DLINPHONE_VERSION=\"3.4.0\" \
 	-DLINPHONE_PLUGINS_DIR=\"\\tmp\" \
 	-DLOG_DOMAIN=\"Linphone\"
 

coreapi/linphonecore_jni.cc

@@ -989,6 +989,12 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCallImpl_isEchoLimiterEnabled
 	return linphone_call_echo_limiter_enabled((LinphoneCall*)ptr);
 }
 
+extern "C" jlong Java_org_linphone_core_LinphoneCallImpl_getReplacedCall(	JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr) {
+	return (jlong)linphone_call_get_replaced_call((LinphoneCall*)ptr);
+}
+
 
 //LinphoneFriend
 extern "C" long Java_org_linphone_core_LinphoneFriendImpl_newLinphoneFriend(JNIEnv*  env

java/common/org/linphone/core/LinphoneCall.java

@@ -178,5 +178,9 @@ public interface LinphoneCall {
 	 * @return true if echo limiter is enabled.
 	 */
 	public boolean isEchoLimiterEnabled();
-
+	/**
+	 * Returns the object associated to a call this one is replacing.
+	 * Call replacement can occur during transfer scenarios.
+	 */
+	public LinphoneCall getReplacedCall();
 }