commit 35f91bdf027aa8fa4ff8e7e162beb643cd4994c3
author Sailesh Nepal <sail@google.com> Sun Sep 21 21:41:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Sep 21 21:41:28 2014 +0000
tree a66c2c6f58bcb0b8fc580901568fc3643f0d5be7
parent cfbf29be2e793ca4b514128103889da555ef8b98
parent c0f337ca7a75f70a9e44fc786931a9ab69be0769

am 5fb8a942: Merge "Pass disconnect reason for failed remote connections" into lmp-dev

* commit '5fb8a9425dfa31b3a50a54ff361e339dc0f777d7':
  Pass disconnect reason for failed remote connections

telecomm/java/android/telecom/RemoteConnectionService.java

diff --git a/telecomm/java/android/telecom/RemoteConnectionService.java b/telecomm/java/android/telecom/RemoteConnectionService.java
index 03b38c2..d959e50 100644
--- a/telecomm/java/android/telecom/RemoteConnectionService.java
+++ b/telecomm/java/android/telecom/RemoteConnectionService.java
@@ -65,7 +65,11 @@
                         parcel.getCallerDisplayName(),
                         parcel.getCallerDisplayNamePresentation());
                 // Set state after handle so that the client can identify the connection.
-                connection.setState(parcel.getState());
+                if (parcel.getState() == Connection.STATE_DISCONNECTED) {
+                    connection.setDisconnected(parcel.getDisconnectCause());
+                } else {
+                    connection.setState(parcel.getState());
+                }
                 List<RemoteConnection> conferenceable = new ArrayList<>();
                 for (String confId : parcel.getConferenceableConnectionIds()) {
                     if (mConnectionById.containsKey(confId)) {