From a7c66cff38099f063d6c5eb7ee44b5952b514f58 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 1 Dec 2010 17:03:22 +0100
Subject: [PATCH] Cleanup.

---
 src/org/linphone/VideoCallActivity.java               | 6 ------
 src/org/linphone/core/AndroidCameraRecordManager.java | 4 ++--
 submodules/linphone                                   | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java
index 3c25333b5..34c72bfac 100644
--- a/src/org/linphone/VideoCallActivity.java
+++ b/src/org/linphone/VideoCallActivity.java
@@ -24,7 +24,6 @@ import org.linphone.core.AndroidCameraRecordManager;
 import org.linphone.core.LinphoneCore;
 
 import android.app.Activity;
-import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -120,11 +119,6 @@ public class VideoCallActivity extends Activity {
 
 		return false;
 	}
-	protected void startprefActivity() {
-		Intent intent = new Intent(Intent.ACTION_MAIN);
-		intent.setClass(this, LinphonePreferencesActivity.class);
-		startActivity(intent);
-	}
 	
 	
 	@Override
diff --git a/src/org/linphone/core/AndroidCameraRecordManager.java b/src/org/linphone/core/AndroidCameraRecordManager.java
index 800879dd5..4c767b887 100644
--- a/src/org/linphone/core/AndroidCameraRecordManager.java
+++ b/src/org/linphone/core/AndroidCameraRecordManager.java
@@ -189,10 +189,10 @@ public class AndroidCameraRecordManager {
 		return false;
 	}
 
+	
 	public void invalidateParameters() {
-		if (isRecording()) stopVideoRecording();
+		stopVideoRecording();
 		parameters = null;
-		
 	}
 
 }
diff --git a/submodules/linphone b/submodules/linphone
index b2e49a28c..a699e2a01 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit b2e49a28c760f7b010ebf31b312edbac660f9894
+Subproject commit a699e2a01aa1a6a487f3c674ee162f6a69cb65af