Merge remote-tracking branch 'origin/master' into newUI

Conflicts:
	submodules/linphone

Makefile

@@ -54,6 +54,7 @@ update-project:
 	$(SDK_PATH)/android update project --path .
 	echo "key.store=$(KEYSTORE)" > ant.properties
 	echo "key.alias=$(KEYALIAS)" >> ant.properties
+	touch default.properties
 
 generate-apk:
 	ant debug

src/org/linphone/LinphoneManager.java

@@ -735,7 +735,10 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		Transports ports = new Transports(t);
 		boolean useStandardPort = getPrefBoolean(R.string.pref_transport_use_standard_ports_key, false);
 		int lPreviousPort = ports.tcp +ports.udp +ports.tls; // assume only one port is active 
-		
+		if (lPreviousPort>0xFFFF) {
+			Log.e("Bad port number ["+lPreviousPort+"] using random instead");
+			lPreviousPort=(0xDFFF & (int)Math.random())+1024;
+		}
 		if (!getPrefBoolean(R.string.pref_transport_tcp_key, false)) {
 			ports.tcp = 0;
 		} else if (useStandardPort) {

submodules/externals/build/exosip/Android.mk

@@ -51,14 +51,14 @@ LOCAL_SRC_FILES += \
 	src/eXrefer_api.c \
 	src/jpublish.c \
 	src/sdp_offans.c
-
+#SOCKET_PROGRESS_TIMEOUT=1000  to take care of edge network
 LOCAL_CFLAGS += \
 	-UHAVE_CONFIG_H \
 	-include $(LOCAL_PATH)/../build/exosip/libeXosip2_AndroidConfig.h \
 	-DOSIP_MT \
 	-DENABLE_TRACE \
 	-DSOCKET_TIMEOUT=50 \
-	-DSOCKET_PROGRESS_TIMEOUT=300 \
+	-DSOCKET_PROGRESS_TIMEOUT=1000 \
 	-include $(LOCAL_PATH)/include/eXosip2/eXosip_transport_hook.h
 
 

submodules/externals/exosip

@@ -1 +1 @@
-Subproject commit 8c42924ae9009f6003e98d29638e078ca1bd7c71
+Subproject commit 05978321cfc73a91a12c2a818a45a308f3f55a47

submodules/externals/speex

@@ -1 +1 @@
-Subproject commit 7657e404191ce939f79fc571008272b411b52089
+Subproject commit 0aa712946869bc6faba5ada29d0d4a2b4a702b46

submodules/linphone

@@ -1 +1 @@
-Subproject commit 57d9f33e253493cdd1b58dcb0c825181bd23f42b
+Subproject commit c4bf7958ab6272155547c1f12e06189e1f84275c