From 8237d96c6795d2fdc4fb3b8ff0b318bc3d9c6e8e Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@linphone.org>
Date: Tue, 4 Dec 2012 16:28:50 +0100
Subject: [PATCH] Fix INVITE without SDP.

---
 src/org/linphone/IncomingCallActivity.java | 8 ++++----
 submodules/linphone                        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index ba4af04ad..b845492be 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -165,11 +165,11 @@ public class IncomingCallActivity extends Activity implements LinphoneOnCallStat
 			if (!LinphoneActivity.isInstanciated()) {
 				return;
 			}
-			
-			if (mCall.getRemoteParams().getVideoEnabled() && LinphoneManager.getInstance().isAutoAcceptCamera()) {
+			final LinphoneCallParams remoteParams = mCall.getRemoteParams();
+			if (remoteParams != null && remoteParams.getVideoEnabled()
+					&& LinphoneManager.getInstance().isAutoAcceptCamera()) {
 				LinphoneActivity.instance().startVideoActivity(mCall);
-			}
-			else {
+			} else {
 				LinphoneActivity.instance().startIncallActivity(mCall);
 			}
 		}
diff --git a/submodules/linphone b/submodules/linphone
index 07c412060..ba478b89e 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 07c4120600ac9e7060f619fa2b94a7b29cbe79da
+Subproject commit ba478b89e88f5b60f6f3ee5bfe9c636cd8648f3e