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

* commit '5fb8a9425dfa31b3a50a54ff361e339dc0f777d7':
  Pass disconnect reason for failed remote connections
This commit is contained in:
Sailesh Nepal
2014-09-21 21:41:19 +00:00
committed by Android Git Automerger

View File

@@ -65,7 +65,11 @@ final class RemoteConnectionService {
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)) {