commit b00433a0a8e0fb556467821a3e5de1b9c2d1d691
author Tyler Gunn <tgunn@google.com> Fri Jul 01 16:00:28 2016 -0700
committer Tyler Gunn <tgunn@google.com> Fri Jul 01 16:00:28 2016 -0700
tree 65b6f760bf83f8ae7e3c5a835a2f51be1dd0f607
parent b00a131d210867ec26e44a9737c725455bfd20a1

Ensure conference capabilities and properties are set on conf start.

We already handle changes to the capabilities and properties, just not
setting them initially.
This fixes a bug where at the start of a conference, there would be no
HD icon on the conference.  You all know conferences need to be HD.

Bug: 29582320
Change-Id: I24cec94499f3bc0d09177d1d190ef9540331fbb6

src/com/android/services/telephony/ImsConference.java

diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index 62bbfe2..fcee589 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -571,8 +571,12 @@
 
         mConferenceHost.addConnectionListener(mConferenceHostListener);
         mConferenceHost.addTelephonyConnectionListener(mTelephonyConnectionListener);
-        setState(mConferenceHost.getState());
+        setConnectionCapabilities(applyHostCapabilities(getConnectionCapabilities(),
+                mConferenceHost.getConnectionCapabilities()));
+        setConnectionProperties(applyHostProperties(getConnectionProperties(),
+                mConferenceHost.getConnectionProperties()));
 
+        setState(mConferenceHost.getState());
         updateStatusHints();
     }