From 3cf1b6cd6350f1ba15b72ce90d7b180e6c804ac6 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 16 May 2014 15:11:56 +0200 Subject: [PATCH] Added security for BT + fix incoming call when no sdp --- src/org/linphone/IncomingCallActivity.java | 5 ----- src/org/linphone/LinphoneManager.java | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java index 7e296604d..a350eef63 100644 --- a/src/org/linphone/IncomingCallActivity.java +++ b/src/org/linphone/IncomingCallActivity.java @@ -156,11 +156,6 @@ public class IncomingCallActivity extends Activity implements LinphoneOnCallStat private void answer() { LinphoneCallParams params = LinphoneManager.getLc().createDefaultCallParameters(); - if (mCall != null && mCall.getRemoteParams() != null && mCall.getRemoteParams().getVideoEnabled() && LinphonePreferences.instance().shouldAutomaticallyAcceptVideoRequests()) { - params.setVideoEnabled(true); - } else { - params.setVideoEnabled(false); - } boolean isLowBandwidthConnection = !LinphoneUtils.isHightBandwidthConnection(this); if (isLowBandwidthConnection) { diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index c4df87d00..3f7b72af8 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -854,6 +854,8 @@ public class LinphoneManager implements LinphoneCoreListener { else if (state == State.IncomingReceived || (state == State.CallIncomingEarlyMedia && mR.getBoolean(R.bool.allow_ringing_while_early_media))) { // Brighten screen for at least 10 seconds if (mLc.getCallsNb() == 1) { + BluetoothManager.getInstance().disableBluetoothSCO(); // Just in case + ringingCall = call; startRinging(); // otherwise there is the beep