Merge branch 'master' of git.linphone.org:linphone-android-private

Conflicts:
	src/org/linphone/core/LinphoneProxyConfigImpl.java

src/org/linphone/LinphoneService.java

@@ -385,7 +385,7 @@ public class LinphoneService extends Service implements LinphoneCoreListener {
 			//init network state
 			ConnectivityManager lConnectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
 			NetworkInfo lInfo = lConnectivityManager.getActiveNetworkInfo();
-			mLinphoneCore.setNetworkStateReachable( lInfo !=null? lConnectivityManager.getActiveNetworkInfo().getState() ==NetworkInfo.State.CONNECTED:false); 
+			mLinphoneCore.setNetworkReachable( lInfo !=null? lConnectivityManager.getActiveNetworkInfo().getState() ==NetworkInfo.State.CONNECTED:false); 
 			
 		} catch (LinphoneCoreException e) {
 			throw new LinphoneConfigException(getString(R.string.wrong_settings),e);

src/org/linphone/NetworkManager.java

@@ -40,9 +40,9 @@ public class NetworkManager extends BroadcastReceiver {
 			return;
 		}
 		if (lNoConnectivity| ((lNetworkInfo.getState() == NetworkInfo.State.DISCONNECTED) /*&& !lIsFailOver*/)) {
-			 LinphoneService.instance().getLinphoneCore().setNetworkStateReachable(false);
+			 LinphoneService.instance().getLinphoneCore().setNetworkReachable(false);
 		 } else if (lNetworkInfo.getState() == NetworkInfo.State.CONNECTED){
-			 LinphoneService.instance().getLinphoneCore().setNetworkStateReachable(true);
+			 LinphoneService.instance().getLinphoneCore().setNetworkReachable(true);
 		 } else {
 			 //unhandled event 
 		 }

src/org/linphone/core/LinphoneCallImpl.java

@@ -61,6 +61,9 @@ class LinphoneCallImpl implements LinphoneCall {
 	public LinphoneCallParams getCurrentParamsReadOnly() {
 		throw new RuntimeException("Not Implemenetd yet");
 	}
+	public void enableCamera(boolean enabled) {
+		throw new RuntimeException("Not Implemenetd yet");
+	}
 	
 	
 }

src/org/linphone/core/LinphoneCoreImpl.java

@@ -179,7 +179,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 			throw new RuntimeException("object already destroyed");
 		}
 	}
-	public void setNetworkStateReachable(boolean isReachable) {
+	public void setNetworkReachable(boolean isReachable) {
 		setNetworkStateReachable(nativePtr,isReachable);
 	}
 	public void setPlaybackGain(float gain) {
@@ -344,6 +344,24 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public LinphoneCallParams createDefaultCallParameters() {
 		throw new RuntimeException("Not Implemenetd yet");
 	}
+	public boolean isNetworkReachable() {
+		throw new RuntimeException("Not Implemenetd yet");
+	}
+	public void setUploadBandwidth(int bw) {
+		throw new RuntimeException("Not Implemenetd yet");
+	}
+	public void setDownloadBandwidth(int bw) {
+		throw new RuntimeException("Not Implemenetd yet");
+	}
+	public void setPreferredVideoSize(VideoSize vSize) {
+		throw new RuntimeException("Not Implemenetd yet");
+	}
+	public VideoSize getPreferredVideoSize() {
+		throw new RuntimeException("Not Implemenetd yet");
+	}
+	public PayloadType[] listVideoCodecs() {
+		throw new RuntimeException("Not Implemenetd yet");
+	}
 	
 
 }

src/org/linphone/core/LinphoneProxyConfigImpl.java

@@ -73,6 +73,9 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig {
 	
 	private native String getRoute(long ptr);
 	private native int setRoute(long ptr,String uri);
+	private native void enablePublish(long ptr,boolean enable);
+	private native boolean publishEnabled(long ptr);
+	
 	
 	public void enableRegister(boolean value) {
 		enableRegister(nativePtr,value);
@@ -127,6 +130,9 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig {
 			throw new LinphoneCoreException("cannot set route ["+routeUri+"]");
 		}
 	}
+	public void enablePublish(boolean enable) {
+		enablePublish(nativePtr,enable);
+	}
 	public RegistrationState getState() {
 		return RegistrationState.fromInt(getState(nativePtr));
 	}
@@ -134,4 +140,7 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig {
 	public void setExpires(int delay) {
 		setExpires(nativePtr, delay);
 	}
+	public boolean publishEnabled() {
+		return publishEnabled(nativePtr); 
+	}
 }

src/org/linphone/core/PayloadTypeImpl.java

@@ -31,4 +31,8 @@ class PayloadTypeImpl implements PayloadType {
 	public String toString() {
 		return toString(nativePtr);
 	}
+
+	public String getMime() {
+		throw new RuntimeException("Not Implemenetd yet");
+	}
 }

submodules/linphone

@@ -1 +1 @@
-Subproject commit e559cf6defcc5e517f8116b314b399e8cec9a26d
+Subproject commit b75917753c938bf3df327dc6acee2618e8d57076