From c831470e14b8b81e3fcd99feba5942cb2f2f9534 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 3 Apr 2013 18:26:41 +0200
Subject: [PATCH 1/2] update linphone submodule with better javadoc

---
 src/org/linphone/LinphoneManager.java | 11 ++++++++---
 submodules/linphone                   |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 04264d30d..c60272ebf 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 package org.linphone;
 
 import static android.media.AudioManager.MODE_NORMAL;
+import static android.media.AudioManager.MODE_RINGTONE;
 import static android.media.AudioManager.STREAM_RING;
 import static android.media.AudioManager.STREAM_VOICE_CALL;
 import static org.linphone.R.string.pref_codec_amr_key;
@@ -377,7 +378,9 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		LinphoneAddress lAddress;
 		try {
 			lAddress = mLc.interpretUrl(to);
-			if (mR.getBoolean(R.bool.forbid_self_call) && mLc.isMyself(lAddress.asStringUriOnly())) {
+			LinphoneProxyConfig lpc = mLc.getDefaultProxyConfig();
+
+			if (mR.getBoolean(R.bool.forbid_self_call) && lpc!=null && lAddress.asStringUriOnly().equals(lpc.getIdentity())) {
 				mListenerDispatcher.tryingNewOutgoingCallButWrongDestinationAddress();
 				return;
 			}
@@ -1291,8 +1294,10 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			return;
 		}
 
-		mLc.startRinging();
-
+		if (Hacks.needGalaxySAudioHack()) {
+			mAudioManager.setMode(MODE_RINGTONE);
+		}
+		
 		try {
 			if ((mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE || mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_NORMAL) && mVibrator !=null) {
 				long[] patern = {0,1000,1000};
diff --git a/submodules/linphone b/submodules/linphone
index 1ba82ad28..1736d38e9 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 1ba82ad289fccf07297d5411c483f332e639f281
+Subproject commit 1736d38e98260bd8441a90e549260ddda8d2243d

From 055a513fd3f67440f3296282d18b94ddd45bb11d Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Fri, 5 Apr 2013 12:49:47 +0200
Subject: [PATCH 2/2] Fix lpc2xml xml2lpc compilation for noneon

---
 jni/Android.mk      | 4 +++-
 submodules/linphone | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 11ed3ae2d..ccd880d7c 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -41,9 +41,11 @@ ifeq ($(BUILD_UPNP),1)
 include $(linphone-root-dir)/submodules/externals/build/libupnp/Android.mk
 endif
 
-#libxml2
+#libxml2 + xml2lpc + lpc2xml
 ifeq ($(BUILD_REMOTE_PROVISIONING),1)
 include $(linphone-root-dir)/submodules/externals/build/libxml2/Android.mk
+include $(linphone-root-dir)/submodules/linphone/build/android/xml2lpc.mk
+include $(linphone-root-dir)/submodules/linphone/build/android/lpc2xml.mk
 endif
 
 # Speex
diff --git a/submodules/linphone b/submodules/linphone
index 1736d38e9..d630e0a99 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 1736d38e98260bd8441a90e549260ddda8d2243d
+Subproject commit d630e0a99decbed3e9a5437b680801dd236beb40