add getReplacedCall()

diff --git a/build/android/Android.mk b/build/android/Android.mk
index a292a0ec084256a9dcdddabb7b2ad2ae16a84c17..48a4c75be6cbef0ab1f3553737d2d45af2a95e9e 100755 (executable)
--- a/build/android/Android.mk
+++ b/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\"
 

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index f8b246ace08ebdabcbcf4f34ebbd8f0d149232f6..1284f81b2e412357fa2a13a2fcc79541f8cb36d1 100644 (file)
--- a/coreapi/linphonecore_jni.cc
+++ b/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

diff --git a/java/common/org/linphone/core/LinphoneCall.java b/java/common/org/linphone/core/LinphoneCall.java
index 29f7f1455e4d49ca0e44485fcbddb4c6d5911c6b..545793eeeb209c5f2ad82351edc0cede270ffa1f 100644 (file)
--- a/java/common/org/linphone/core/LinphoneCall.java
+++ b/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();
 }