Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Telecom API updates (1/6)

Browse Source 
Bug: 18292176

Change-Id: I060366234a5a60510c385dc837f2b7e79596eaf5
This commit is contained in:
Ihab Awad
2014-11-12 13:41:16 -08:00
parent 07b4a29131
commit 5c9c86ec0f
15 changed files with 644 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
telecomm/java/android/telecom/RemoteConnectionService.java
View File

@@ -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