diff options
| author | Ihab Awad <ihab@google.com> | 2014-11-12 13:41:16 -0800 |
|---|---|---|
| committer | Ihab Awad <ihab@google.com> | 2014-11-28 15:54:35 -0800 |
| commit | 5c9c86ec0f95d1f5e1aca212967f508fc736b895 (patch) | |
| tree | 1706be6ac513145c4d0eab52649319509bd99d1e /telecomm/java/android/telecom/RemoteConnectionService.java | |
| parent | 07b4a291319ec48a272451789ab0fbbf8d55a050 (diff) | |
Telecom API updates (1/6)
Bug: 18292176
Change-Id: I060366234a5a60510c385dc837f2b7e79596eaf5
Diffstat (limited to 'telecomm/java/android/telecom/RemoteConnectionService.java')
| -rw-r--r-- | telecomm/java/android/telecom/RemoteConnectionService.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/telecomm/java/android/telecom/RemoteConnectionService.java b/telecomm/java/android/telecom/RemoteConnectionService.java index 4bb78c010303..906ecaaa8277 100644 --- a/telecomm/java/android/telecom/RemoteConnectionService.java +++ b/telecomm/java/android/telecom/RemoteConnectionService.java @@ -59,7 +59,7 @@ final class RemoteConnectionService { if (connection != NULL_CONNECTION && mPendingConnections.contains(connection)) { mPendingConnections.remove(connection); // Unconditionally initialize the connection ... - connection.setCallCapabilities(parcel.getCapabilities()); + connection.setConnectionCapabilities(parcel.getConnectionCapabilities()); connection.setAddress( parcel.getHandle(), parcel.getHandlePresentation()); connection.setCallerDisplayName( @@ -139,13 +139,13 @@ final class RemoteConnectionService { } @Override - public void setCallCapabilities(String callId, int callCapabilities) { + public void setConnectionCapabilities(String callId, int connectionCapabilities) { if (mConnectionById.containsKey(callId)) { - findConnectionForAction(callId, "setCallCapabilities") - .setCallCapabilities(callCapabilities); + findConnectionForAction(callId, "setConnectionCapabilities") + .setConnectionCapabilities(connectionCapabilities); } else { - findConferenceForAction(callId, "setCallCapabilities") - .setCallCapabilities(callCapabilities); + findConferenceForAction(callId, "setConnectionCapabilities") + .setConnectionCapabilities(connectionCapabilities); } } @@ -192,7 +192,7 @@ final class RemoteConnectionService { } conference.setState(parcel.getState()); - conference.setCallCapabilities(parcel.getCapabilities()); + conference.setConnectionCapabilities(parcel.getConnectionCapabilities()); mConferenceById.put(callId, conference); conference.registerCallback(new RemoteConference.Callback() { @Override |