diff --git a/src/org/linphone/CallManager.java b/src/org/linphone/CallManager.java index 4d0eff734..e0c39abef 100644 --- a/src/org/linphone/CallManager.java +++ b/src/org/linphone/CallManager.java @@ -121,6 +121,8 @@ public class CallManager { LinphoneCall lCall = lc.getCurrentCall(); LinphoneCallParams params = lCall.getCurrentParamsCopy(); bm().updateWithProfileSettings(lc, params); + lc.updateCall(lCall, null); + } } diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java index cc720699e..e7549e0b1 100644 --- a/src/org/linphone/VideoCallActivity.java +++ b/src/org/linphone/VideoCallActivity.java @@ -193,7 +193,6 @@ public class VideoCallActivity extends Activity { break; case R.id.videocall_menu_switch_camera: recordManager.stopVideoRecording(); - sendStaticImage(true); recordManager.toggleUseFrontCamera(); CallManager.getInstance().updateCall(); // camera will be restarted when mediastreamer chain is recreated and setParameters is called diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java index b49856e91..3c21fe0f6 100644 --- a/src/org/linphone/core/LinphoneCoreImpl.java +++ b/src/org/linphone/core/LinphoneCoreImpl.java @@ -382,7 +382,7 @@ class LinphoneCoreImpl implements LinphoneCore { public int updateCall(LinphoneCall call, LinphoneCallParams params) { long ptrCall = ((LinphoneCallImpl) call).nativePtr; - long ptrParams = ((LinphoneCallParamsImpl)params).nativePtr; + long ptrParams = params!=null ? ((LinphoneCallParamsImpl)params).nativePtr : 0; return updateCall(nativePtr, ptrCall, ptrParams); } diff --git a/src/org/linphone/core/Version.java b/src/org/linphone/core/Version.java index 0ec07fc25..b094e31d7 100644 --- a/src/org/linphone/core/Version.java +++ b/src/org/linphone/core/Version.java @@ -27,8 +27,8 @@ import android.os.Build; public class Version { private static final int buildVersion = -// Integer.parseInt(Build.VERSION.SDK); - 7; // 2.1 + Integer.parseInt(Build.VERSION.SDK); +// 7; // 2.1 public static final boolean sdkAbove(int value) { return buildVersion >= value; @@ -38,4 +38,4 @@ public class Version { return buildVersion < value; } -} +} \ No newline at end of file diff --git a/submodules/linphone b/submodules/linphone index 4aaf103d0..8915b1ff3 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 4aaf103d0617a1dc74f5a8664b3ac45a5bcaf18d +Subproject commit 8915b1ff3ee9fe40df4c0d1b2d794c443e83a1cc