diff options
| author | Sailesh Nepal <sail@google.com> | 2014-09-10 19:45:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-10 19:45:04 +0000 |
| commit | fab395e9b9d49fe824d562f1b4dd7a400d944d4e (patch) | |
| tree | 1eee046e21ded87ea45e122176b603e7efac67e3 /telecomm | |
| parent | 8c9e975c44d35c111176e4b8c38555121495e7ae (diff) | |
| parent | 70638f1f364ee6ddf50d159ff913a87230c27f70 (diff) | |
| download | frameworks_base-fab395e9b9d49fe824d562f1b4dd7a400d944d4e.zip frameworks_base-fab395e9b9d49fe824d562f1b4dd7a400d944d4e.tar.gz frameworks_base-fab395e9b9d49fe824d562f1b4dd7a400d944d4e.tar.bz2 | |
Merge "Set remote connection state after setting handle" into lmp-dev
Diffstat (limited to 'telecomm')
| -rw-r--r-- | telecomm/java/android/telecomm/RemoteConnectionService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/telecomm/java/android/telecomm/RemoteConnectionService.java b/telecomm/java/android/telecomm/RemoteConnectionService.java index 348c36c..8b8e8eb 100644 --- a/telecomm/java/android/telecomm/RemoteConnectionService.java +++ b/telecomm/java/android/telecomm/RemoteConnectionService.java @@ -60,13 +60,14 @@ final class RemoteConnectionService { if (connection != NULL_CONNECTION && mPendingConnections.contains(connection)) { mPendingConnections.remove(connection); // Unconditionally initialize the connection ... - connection.setState(parcel.getState()); connection.setCallCapabilities(parcel.getCapabilities()); connection.setHandle( parcel.getHandle(), parcel.getHandlePresentation()); connection.setCallerDisplayName( parcel.getCallerDisplayName(), parcel.getCallerDisplayNamePresentation()); + // Set state after handle so that the client can identify the connection. + connection.setState(parcel.getState()); List<RemoteConnection> conferenceable = new ArrayList<>(); for (String confId : parcel.getConferenceableConnectionIds()) { if (mConnectionById.containsKey(confId)) { |