From 2a54fc632f5e116640f16535761ac254691ce770 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 12 Oct 2011 11:30:14 +0200
Subject: [PATCH] Delay mic/speaker state update in conference activity.

Otherwise the state is still in speaker due to ringing just ended.
---
 src/org/linphone/ConferenceActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 210ddf3f4..5fe7de921 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -145,8 +145,6 @@ public class ConferenceActivity extends ListActivity implements
 	@Override
 	public void onResumeWhenManagerReady() {
 		registerLinphoneListener(true);
-		mSpeakerButton.setChecked(LinphoneManager.getInstance().isSpeakerOn());
-		mMuteMicButton.setChecked(LinphoneManager.getLc().isMicMuted());
 		updateCalleeImage();
 		updateConfState();
 		updateSimpleControlButtons();
@@ -154,6 +152,8 @@ public class ConferenceActivity extends ListActivity implements
 		adapter.notifyDataSetInvalidated();
 		adapter.notifyDataSetChanged();
 		LinphoneManager.startProximitySensorForActivity(this);
+		mSpeakerButton.setChecked(LinphoneManager.getInstance().isSpeakerOn());
+		mMuteMicButton.setChecked(LinphoneManager.getLc().isMicMuted());
 	}
 
 	@Override