Add StatusHints to Conference object.

+ Consolidated ParcelableConference constructors; only one is used.

Bug: 20181703
Change-Id: Iad49f10404e1c1eedc4ef68525bde0f10a8dfc97
This commit is contained in:
Andrew Lee
2015-04-14 13:38:12 -07:00
parent 6b91ebf58c
commit edc625f52e
4 changed files with 47 additions and 17 deletions

View File

@@ -415,6 +415,12 @@ public abstract class ConnectionService extends Service {
Connection.capabilitiesToString(connectionCapabilities));
mAdapter.setConnectionCapabilities(id, connectionCapabilities);
}
@Override
public void onStatusHintsChanged(Conference conference, StatusHints statusHints) {
String id = mIdByConference.get(conference);
mAdapter.setStatusHints(id, statusHints);
}
};
private final Connection.Listener mConnectionListener = new Connection.Listener() {
@@ -884,7 +890,8 @@ public abstract class ConnectionService extends Service {
conference.getState(),
conference.getConnectionCapabilities(),
connectionIds,
conference.getConnectTimeMillis());
conference.getConnectTimeMillis(),
conference.getStatusHints());
mAdapter.addConferenceCall(id, parcelableConference);
// Go through any child calls and set the parent.