From b6b080e648a7c6ceff518ff76028fe7074ec0162 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 30 Nov 2011 13:53:07 +0100
Subject: [PATCH] Fix share my camera setting not honored (regression)

---
 src/org/linphone/LinphoneActivity.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index be41c7e5d..a2cb42a87 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -485,7 +485,9 @@ public class LinphoneActivity extends TabActivity implements
 			finishActivity(INCOMING_CALL_ACTIVITY);
 		}
 		if (state == LinphoneCall.State.StreamsRunning && Version.isVideoCapable() && !call.isInConference()) {
-			boolean videoEnabled = call.getCurrentParamsCopy().getVideoEnabled();
+			// call.cameraEnabled() contains the wish of the user
+			// set in LinphoneManager#onCallStateChanged(OutgoingInit||IncomingReceived)
+			boolean videoEnabled = call.cameraEnabled() && call.getCurrentParamsCopy().getVideoEnabled();
 			if (videoEnabled) {
 				startVideoActivity(call, 1000);
 			} else {