diff options
author | Etan Cohen <etancohen@google.com> | 2015-04-24 14:02:07 -0700 |
---|---|---|
committer | Etan Cohen <etancohen@google.com> | 2015-04-24 14:02:07 -0700 |
commit | 94f2c27aca75bf96a5600ada7395f34cc2df42ce (patch) | |
tree | 1394a21f5c59026dc55b275e12bd0be354511372 /telecomm/java/android/telecom/ConnectionService.java | |
parent | bd3dfa9d652eaa5bd2d0ef1236d83498112b8914 (diff) | |
parent | 7f61051949875edf4bfbf29b00ad6f2ede61d6cb (diff) | |
download | frameworks_base-94f2c27aca75bf96a5600ada7395f34cc2df42ce.zip frameworks_base-94f2c27aca75bf96a5600ada7395f34cc2df42ce.tar.gz frameworks_base-94f2c27aca75bf96a5600ada7395f34cc2df42ce.tar.bz2 |
Merge commit '7f61051' into merge2
Diffstat (limited to 'telecomm/java/android/telecom/ConnectionService.java')
-rw-r--r-- | telecomm/java/android/telecom/ConnectionService.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java index 9812815..c039acf 100644 --- a/telecomm/java/android/telecom/ConnectionService.java +++ b/telecomm/java/android/telecom/ConnectionService.java @@ -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()); |