test if sample rate is supported by android sound card, remove areStreamsEncrypted...

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 1bd7d091287a4528d3b5b3701829fac4a4ddfe7b..fb62302afec622a5028670e570982fbd9bc4bd13 100644 (file)
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -1577,9 +1577,6 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCallImpl_isAuthenticationToke
        LinphoneCall *call = (LinphoneCall *) ptr;
        return linphone_call_get_authentication_token_verified(call);
 }
-extern "C" jboolean Java_org_linphone_core_LinphoneCallImpl_areStreamsEncrypted(JNIEnv*  env,jobject thiz,jlong ptr) {
-       return linphone_call_are_all_streams_encrypted((LinphoneCall *) ptr);
-}
 
 extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_soundResourcesLocked(JNIEnv* env,jobject thiz,jlong ptr){
        return linphone_core_sound_resources_locked((LinphoneCore *) ptr);

diff --git a/java/common/org/linphone/core/LinphoneCall.java b/java/common/org/linphone/core/LinphoneCall.java
index b4a3866787bed30579594b1820b6ec2568f5fe9d..1c4b0e85b23073f7d3af1cd12f6b4a48e20bd0a1 100644 (file)
--- a/java/common/org/linphone/core/LinphoneCall.java
+++ b/java/common/org/linphone/core/LinphoneCall.java
@@ -223,6 +223,5 @@ public interface LinphoneCall {
        
        String getAuthenticationToken();
        boolean isAuthenticationTokenVerified();
-       boolean areStreamsEncrypted();
        boolean isInConference();
 }

diff --git a/mediastreamer2 b/mediastreamer2
index 548a7f014b5066d1d4571f91eb4440aefa35244b..e39ed3940eb2d4c0589ea488f9a2eba5a335f059 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 548a7f014b5066d1d4571f91eb4440aefa35244b
+Subproject commit e39ed3940eb2d4c0589ea488f9a2eba5a335f059