Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '7f61051' into merge2

Browse Source
This commit is contained in:
Etan Cohen
2015-04-24 14:02:07 -07:00
parent bd3dfa9d65 7f61051949
commit 94f2c27aca
6 changed files with 63 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
telecomm/java/android/telecom/ConnectionService.java
View File

@@ -427,6 +427,12 @@ public abstract class ConnectionService extends Service {
videoProvider);
mAdapter.setVideoProvider(id, videoProvider);
}
@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() {
@@ -903,8 +909,9 @@ public abstract class ConnectionService extends Service {
conference.getVideoProvider() == null ?
null : conference.getVideoProvider().getInterface(),
conference.getVideoState(),
conference.getConnectTimeMillis()
);
conference.getConnectTimeMillis(),
conference.getStatusHints());
mAdapter.addConferenceCall(id, parcelableConference);
mAdapter.setVideoProvider(id, conference.getVideoProvider());
mAdapter.setVideoState(id, conference.getVideoState());