Add StatusHints for Conferences.
Bug: 20160799
Change-Id: I88d3068a2c2d2d785e92bcb8b22143764f0a6207
diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index 3732a4f..e683d9b 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -1061,6 +1061,7 @@
setCallState(call, Call.getStateFromConnectionState(parcelableConference.getState()));
call.setConnectionCapabilities(parcelableConference.getConnectionCapabilities());
+ call.setStatusHints(parcelableConference.getStatusHints());
// TODO: Move this to be a part of addCall()
call.addListener(this);
diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/com/android/server/telecom/ConnectionServiceWrapper.java
index d470737..c02d3f0 100644
--- a/src/com/android/server/telecom/ConnectionServiceWrapper.java
+++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java
@@ -561,7 +561,7 @@
@Override
public void setStatusHints(String callId, StatusHints statusHints) {
logIncoming("setStatusHints %s %s", callId, statusHints);
- if (mCallIdMapper.isValidCallId(callId)) {
+ if (mCallIdMapper.isValidCallId(callId) || mCallIdMapper.isValidConferenceId(callId)) {
SomeArgs args = SomeArgs.obtain();
args.arg1 = callId;
args.arg2 = statusHints;