Telecom API updates (1/6)
Bug: 18292176
Change-Id: I060366234a5a60510c385dc837f2b7e79596eaf5
diff --git a/telecomm/java/android/telecom/RemoteConnectionService.java b/telecomm/java/android/telecom/RemoteConnectionService.java
index 4bb78c0..906ecaa 100644
--- a/telecomm/java/android/telecom/RemoteConnectionService.java
+++ b/telecomm/java/android/telecom/RemoteConnectionService.java
@@ -59,7 +59,7 @@
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 @@
}
@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 @@
}
conference.setState(parcel.getState());
- conference.setCallCapabilities(parcel.getCapabilities());
+ conference.setConnectionCapabilities(parcel.getConnectionCapabilities());
mConferenceById.put(callId, conference);
conference.registerCallback(new RemoteConference.Callback() {
@Override