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

Handle synchronous failed connection

Browse Source 
Change-Id: I406ccbdd1f70c85456b6e0d689332cf40a756707
This commit is contained in:
Sailesh Nepal
2014-07-28 10:25:27 -07:00
parent 0fa59b898a
commit 4e7ec71e64
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -28694,7 +28694,6 @@ package android.telecomm {
method public final android.telecomm.RemoteConnection createRemoteIncomingConnection(android.telecomm.ConnectionRequest);
method public final android.telecomm.RemoteConnection createRemoteOutgoingConnection(android.telecomm.ConnectionRequest);
method public final java.util.Collection<android.telecomm.Connection> getAllConnections();
method public final void maybeRespondToAccountLookup();
method public final android.os.IBinder onBind(android.content.Intent);
method public void onConnectionAdded(android.telecomm.Connection);
method public void onConnectionRemoved(android.telecomm.Connection);

18
telecomm/java/android/telecomm/ConnectionService.java
View File

@@ -80,8 +80,6 @@ public abstract class ConnectionService extends Service {
private final Map<Connection, String> mIdByConnection = new HashMap<>();
private final RemoteConnectionManager mRemoteConnectionManager = new RemoteConnectionManager();
private SimpleResponse<Uri, List<PhoneAccountHandle>> mAccountLookupResponse;
private Uri mAccountLookupHandle;
private boolean mAreAccountsInitialized = false;
private final ConnectionServiceAdapter mAdapter = new ConnectionServiceAdapter();
@@ -474,6 +472,9 @@ public abstract class ConnectionService extends Service {
} else if (createdConnection.getState() == Connection.State.CANCELED) {
// Tell telecomm not to attempt any more services.
mAdapter.handleCreateConnectionCancelled(request);
} else if (createdConnection.getState() == Connection.State.FAILED) {
mAdapter.handleCreateConnectionFailed(request, createdConnection.getFailureCode(),
createdConnection.getFailureMessage());
} else {
connectionCreated(request, createdConnection);
}
@@ -625,7 +626,6 @@ public abstract class ConnectionService extends Service {
}
mAreAccountsInitialized = true;
Log.d(this, "remote connection services found: " + services);
maybeRespondToAccountLookup();
}
});
}
@@ -635,24 +635,12 @@ public abstract class ConnectionService extends Service {
mHandler.post(new Runnable() {
@Override public void run() {
mAreAccountsInitialized = true;
maybeRespondToAccountLookup();
}
});
}
});
}
public final void maybeRespondToAccountLookup() {
if (mAreAccountsInitialized && mAccountLookupResponse != null) {
mAccountLookupResponse.onResult(
mAccountLookupHandle,
mRemoteConnectionManager.getAccounts(mAccountLookupHandle));
mAccountLookupHandle = null;
mAccountLookupResponse = null;
}
}
public final RemoteConnection createRemoteIncomingConnection(ConnectionRequest request) {
return mRemoteConnectionManager.createRemoteConnection(request, true);
}