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

Add API to cancel outgoing calls

Browse Source 
This replaces CallServiceSelectorAdapter.cancelOutgoingCall

Change-Id: I9e5da9c607675bc3c230f6eb6d1cc149a38bf905
This commit is contained in:
Sailesh Nepal
2014-06-25 13:35:14 -07:00
parent ef14da3280
commit 506e38690f
6 changed files with 89 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
telecomm/java/android/telecomm/RemoteConnectionService.java
View File

@@ -43,7 +43,7 @@ public class RemoteConnectionService implements DeathRecipient {
private String mConnectionId;
private ConnectionRequest mPendingRequest;
private SimpleResponse<ConnectionRequest, RemoteConnection> mPendingResponse;
private ConnectionService.OutgoingCallResponse<RemoteConnection> mPendingOutgoingCallResponse;
// Remote connection services only support a single connection.
private RemoteConnection mConnection;
@@ -60,7 +60,7 @@ public class RemoteConnectionService implements DeathRecipient {
public void handleSuccessfulOutgoingCall(String connectionId) {
if (isPendingConnection(connectionId)) {
mConnection = new RemoteConnection(mCallService, connectionId);
mPendingResponse.onResult(mPendingRequest, mConnection);
mPendingOutgoingCallResponse.onSuccess(mPendingRequest, mConnection);
clearPendingInformation();
}
}
@@ -72,7 +72,17 @@ public class RemoteConnectionService implements DeathRecipient {
if (isPendingConnection(request.getCallId())) {
// Use mPendingRequest instead of request so that we use the same object that was
// passed in to us.
mPendingResponse.onError(request);
mPendingOutgoingCallResponse.onFailure(mPendingRequest, errorCode, errorMessage);
mConnectionId = null;
clearPendingInformation();
}
}
/** ${inheritDoc} */
@Override
public void cancelOutgoingCall(String connectionId) {
if (isPendingConnection(connectionId)) {
mPendingOutgoingCallResponse.onCancel(mPendingRequest);
mConnectionId = null;
clearPendingInformation();
}
@@ -208,7 +218,7 @@ public class RemoteConnectionService implements DeathRecipient {
*/
public void createOutgoingConnection(
ConnectionRequest request,
SimpleResponse<ConnectionRequest, RemoteConnection> response) {
ConnectionService.OutgoingCallResponse<RemoteConnection> response) {
if (mConnectionId == null) {
String id = UUID.randomUUID().toString();
@@ -216,13 +226,13 @@ public class RemoteConnectionService implements DeathRecipient {
try {
mCallService.call(callInfo);
mConnectionId = id;
mPendingResponse = response;
mPendingOutgoingCallResponse = response;
mPendingRequest = request;
} catch (RemoteException e) {
response.onError(request);
response.onFailure(request, DisconnectCause.ERROR_UNSPECIFIED, e.toString());
}
} else {
response.onError(request);
response.onFailure(request, DisconnectCause.ERROR_UNSPECIFIED, null);
}
}
@@ -254,7 +264,7 @@ public class RemoteConnectionService implements DeathRecipient {
}
private boolean isPendingConnection(String id) {
return TextUtils.equals(mConnectionId, id) && mPendingResponse != null;
return TextUtils.equals(mConnectionId, id) && mPendingOutgoingCallResponse != null;
}
private boolean isCurrentConnection(String id) {
@@ -263,7 +273,7 @@ public class RemoteConnectionService implements DeathRecipient {
private void clearPendingInformation() {
mPendingRequest = null;
mPendingResponse = null;
mPendingOutgoingCallResponse = null;
}
private void destroyConnection() {