commit 9f0c6f6137e2eda1fd6a0e85893b0835216c2dcf
author Hall Liu <hallliu@google.com> Mon Jul 18 17:44:38 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 18 17:44:40 2016 +0000
tree 4f8e31e3b563fe0922a5ef6e173aaf08e3ce4433
parent 9115aeb89a584ed173665c7fff725e1a41564a4b
parent a1e95e75fa9b189ea81ce5b27d74a0904c5e94cf

Merge "Add properties and capabilities to GsmConnection after SRVCC" into nyc-mr1-dev

src/com/android/services/telephony/ImsConference.java

diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index 908c1bb..9698e0e 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -848,6 +848,9 @@
                 GsmConnection c = new GsmConnection(originalConnection, getTelecomCallId());
                 // This is a newly created conference connection as a result of SRVCC
                 c.setConferenceSupported(true);
+                c.addCapability(Connection.CAPABILITY_CONFERENCE_HAS_NO_CHILDREN);
+                c.setConnectionProperties(
+                        c.getConnectionProperties() | Connection.PROPERTY_IS_DOWNGRADED_CONFERENCE);
                 c.updateState();
                 // Copy the connect time from the conferenceHost
                 c.setConnectTimeMillis(mConferenceHost.getConnectTimeMillis());