diff options
| author | Tyler Gunn <tgunn@google.com> | 2016-03-22 09:02:47 -0700 |
|---|---|---|
| committer | Tyler Gunn <tgunn@google.com> | 2016-03-24 20:20:11 -0700 |
| commit | 720c664401081ca00e56c7eef12641ae792da530 (patch) | |
| tree | 3223364426b37927b9c34f7ab091d69878b65638 /telecomm/java/android/telecom/RemoteConnectionService.java | |
| parent | 2dc6cc9aa4ed44e6f337e8600856cd2e1d3e2f70 (diff) | |
Add connection properties to Connections.
- Per suggestion of API council, moving properties of a Connection from
CAPABILITIES_* to PROPERTIES_*.
Bug: 27458894
Change-Id: Icce921b03cda514a991646ed39a26559c7e91230
Diffstat (limited to 'telecomm/java/android/telecom/RemoteConnectionService.java')
| -rw-r--r-- | telecomm/java/android/telecom/RemoteConnectionService.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/RemoteConnectionService.java b/telecomm/java/android/telecom/RemoteConnectionService.java index d88d007e532e..21a7706e5f55 100644 --- a/telecomm/java/android/telecom/RemoteConnectionService.java +++ b/telecomm/java/android/telecom/RemoteConnectionService.java @@ -61,6 +61,7 @@ final class RemoteConnectionService { mPendingConnections.remove(connection); // Unconditionally initialize the connection ... connection.setConnectionCapabilities(parcel.getConnectionCapabilities()); + connection.setConnectionProperties(parcel.getConnectionProperties()); if (parcel.getHandle() != null || parcel.getState() != Connection.STATE_DISCONNECTED) { connection.setAddress(parcel.getHandle(), parcel.getHandlePresentation()); @@ -156,6 +157,17 @@ final class RemoteConnectionService { } @Override + public void setConnectionProperties(String callId, int connectionProperties) { + if (mConnectionById.containsKey(callId)) { + findConnectionForAction(callId, "setConnectionProperties") + .setConnectionProperties(connectionProperties); + } else { + findConferenceForAction(callId, "setConnectionProperties") + .setConnectionProperties(connectionProperties); + } + } + + @Override public void setIsConferenced(String callId, String conferenceCallId) { // Note: callId should not be null; conferenceCallId may be null RemoteConnection connection = |