From 70638f1f364ee6ddf50d159ff913a87230c27f70 Mon Sep 17 00:00:00 2001
From: Sailesh Nepal <sail@google.com>
Date: Tue, 9 Sep 2014 21:49:14 -0700
Subject: Set remote connection state after setting handle

This CL sets the remote connection state after setting the
handle. This makes it easier to identify the connection
for things like ring deduping.

Bug: 17448801
Change-Id: Id08ab0bc6a257384842250ced19cd297a58c0b87
---
 telecomm/java/android/telecomm/RemoteConnectionService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'telecomm')

diff --git a/telecomm/java/android/telecomm/RemoteConnectionService.java b/telecomm/java/android/telecomm/RemoteConnectionService.java
index 79193c2..d343be7 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)) {
-- 
cgit v1.1