Fix share my camera setting not honored (regression)

This commit is contained in:
Guillaume Beraudo 2011-11-30 13:53:07 +01:00
parent d4308ddc31
commit b6b080e648

View file

@ -485,7 +485,9 @@ public class LinphoneActivity extends TabActivity implements
finishActivity(INCOMING_CALL_ACTIVITY); finishActivity(INCOMING_CALL_ACTIVITY);
} }
if (state == LinphoneCall.State.StreamsRunning && Version.isVideoCapable() && !call.isInConference()) { 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) { if (videoEnabled) {
startVideoActivity(call, 1000); startVideoActivity(call, 1000);
} else { } else {