summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tyler Gunn <tgunn@google.com> 2016-08-15 22:32:02 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-08-15 22:32:03 +0000
commitaa9b18f90a29eef2cfe7b97afcbccf367ccaaebc (patch)
tree31ec52cfe1b688898cb384d26273ac1116c2a15d
parentd381bc31336dbd0ac12152d76275688dea157e79 (diff)
parent04ce7578607e022e980f69a45bccfa6f84ad6785 (diff)
Merge "Add missing remote conference property set." into nyc-mr1-dev
-rw-r--r--telecomm/java/android/telecom/RemoteConnectionService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/RemoteConnectionService.java b/telecomm/java/android/telecom/RemoteConnectionService.java
index 306b3c15fa11..c4739ff13a19 100644
--- a/telecomm/java/android/telecom/RemoteConnectionService.java
+++ b/telecomm/java/android/telecom/RemoteConnectionService.java
@@ -224,6 +224,7 @@ final class RemoteConnectionService {
conference.setState(parcel.getState());
conference.setConnectionCapabilities(parcel.getConnectionCapabilities());
+ conference.setConnectionProperties(parcel.getConnectionProperties());
mConferenceById.put(callId, conference);
conference.registerCallback(new RemoteConference.Callback() {
@Override