diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index 22e774acc..7fb342c5c 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -393,34 +393,28 @@ public class DialerActivity extends SoftVolumeActivity implements LinphoneGuiLis
 			return;
 		}
 		
-		switch (state) {
-			case OutgoingInit:
+		if (state==LinphoneCall.State.OutgoingInit){
+			enterIncallMode(lc);
+			if (!LinphoneManager.getInstance().shareMyCamera())
+				call.enableCamera(false);
+			LinphoneActivity.instance().startOrientationSensor();
+		}else if (state==LinphoneCall.State.IncomingReceived){
+			callPending(call);
+			if (!LinphoneManager.getInstance().shareMyCamera())
+				call.enableCamera(false);
+			LinphoneActivity.instance().startOrientationSensor();
+		}else if (state==LinphoneCall.State.Connected){
+			if (call.getDirection() == CallDirection.Incoming) {
 				enterIncallMode(lc);
-				if (!LinphoneManager.getInstance().shareMyCamera())
-					call.enableCamera(false);
-				LinphoneActivity.instance().startOrientationSensor();
-				break;
-			case IncomingReceived: 
-				callPending(call);
-				if (!LinphoneManager.getInstance().shareMyCamera())
-					call.enableCamera(false);
-				LinphoneActivity.instance().startOrientationSensor();
-				break;
-			case Connected:
-				if (call.getDirection() == CallDirection.Incoming) {
-					enterIncallMode(lc);
-				}
-				break;
-			case Error:
-				if (mWakeLock.isHeld()) mWakeLock.release();
-				showToast(R.string.call_error, message);
-				exitCallMode();
-				LinphoneActivity.instance().stopOrientationSensor();
-				break;
-			case CallEnd:
-				exitCallMode();
-				LinphoneActivity.instance().stopOrientationSensor();
-				break;
+			}
+		}else if (state==LinphoneCall.State.Error){
+			if (mWakeLock.isHeld()) mWakeLock.release();
+			showToast(R.string.call_error, message);
+			exitCallMode();
+			LinphoneActivity.instance().stopOrientationSensor();
+		}else if (state==LinphoneCall.State.CallEnd){
+			exitCallMode();
+			LinphoneActivity.instance().stopOrientationSensor();
 		}
 	}
 
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 803acc991..482dc23a3 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -287,11 +287,9 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 		}
 	}
 	
-	@Override
 	public void onAccuracyChanged(Sensor sensor, int accuracy) {
 		
 	}
-	@Override
 	public void onSensorChanged(SensorEvent event) {
 		if (event==null || event.sensor == mAccelerometer) {
 			// WARNING : getRotation() is SDK > 5
diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java
index b0bb2de9d..2b7e1a847 100644
--- a/src/org/linphone/VideoCallActivity.java
+++ b/src/org/linphone/VideoCallActivity.java
@@ -66,23 +66,19 @@ public class VideoCallActivity extends SoftVolumeActivity {
 		androidVideoWindowImpl = new AndroidVideoWindowImpl(mVideoView, mVideoCaptureView);
 		androidVideoWindowImpl.setListener(new AndroidVideoWindowImpl.VideoWindowListener() {
 			
-			@Override
 			public void onVideoRenderingSurfaceReady(AndroidVideoWindowImpl vw) {
 				LinphoneManager.getLc().setVideoWindow(vw);
 			}
 			
-			@Override
 			public void onVideoRenderingSurfaceDestroyed(AndroidVideoWindowImpl vw) {
 				Log.d("VIDEO WINDOW destroyed!\n");
 				LinphoneManager.getLc().setVideoWindow(null);
 			}
 			
-			@Override 
 			public void onVideoPreviewSurfaceReady(AndroidVideoWindowImpl vw) {
 				LinphoneManager.getLc().setPreviewWindow(mVideoCaptureView);
 			}
 			
-			@Override
 			public void onVideoPreviewSurfaceDestroyed(AndroidVideoWindowImpl vw) {
 				
 			}
diff --git a/src/org/linphone/core/LinphoneCallImpl.java b/src/org/linphone/core/LinphoneCallImpl.java
index b027e2170..db8b3f733 100644
--- a/src/org/linphone/core/LinphoneCallImpl.java
+++ b/src/org/linphone/core/LinphoneCallImpl.java
@@ -80,7 +80,6 @@ class LinphoneCallImpl implements LinphoneCall {
 	public void enableCamera(boolean enabled) {
 		enableCamera(nativePtr, enabled);
 	}
-	@Override
 	public boolean cameraEnabled() {
 		return cameraEnabled(nativePtr);
 	}
@@ -127,4 +126,8 @@ class LinphoneCallImpl implements LinphoneCall {
 	public boolean areStreamsEncrypted() {
 		return areStreamsEncrypted(nativePtr);
 	}
+	public boolean isInConference() {
+		// TODO Auto-generated method stub
+		return false;
+	}
 }
diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java
index d4b54b663..20d18e90e 100644
--- a/src/org/linphone/core/LinphoneCoreImpl.java
+++ b/src/org/linphone/core/LinphoneCoreImpl.java
@@ -20,6 +20,7 @@ package org.linphone.core;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.List;
 import java.util.Vector;
 
 import org.linphone.LinphoneManager;
@@ -491,16 +492,58 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public void enableEchoLimiter(boolean val) {
 		enableEchoLimiter(nativePtr,val);
 	}
-	@Override
 	public void setVideoDevice(int id) {
 		Log.i("Setting camera id :", id);
 		if (setVideoDevice(nativePtr, id) != 0) {
 			Log.e("Failed to set video device to id:", id);
 		}
 	}
-	@Override
 	public int getVideoDevice() {
 		return getVideoDevice(nativePtr);
 	}
+	public void addAllToConference() {
+		// TODO Auto-generated method stub
+		
+	}
+	public void addToConference(LinphoneCall call) {
+		// TODO Auto-generated method stub
+		
+	}
+	public void enterConference() {
+		// TODO Auto-generated method stub
+		
+	}
+	public List getCalls() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+	public int getCallsNb() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+	public int getConferenceSize() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+	public boolean isInConference() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+	public void leaveConference() {
+		// TODO Auto-generated method stub
+		
+	}
+	public void removeFromConference(LinphoneCall call) {
+		// TODO Auto-generated method stub
+		
+	}
+	public void terminateAllCalls() {
+		// TODO Auto-generated method stub
+		
+	}
+	public void terminateConference() {
+		// TODO Auto-generated method stub
+		
+	}
 	
 }
diff --git a/submodules/linphone b/submodules/linphone
index b6a5ffcec..ce9780dcb 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit b6a5ffcec94e10b026982fbccc29031e811c519c
+Subproject commit ce9780dcb8114a3d4def3ed14fbb129ff786fba2