commit 2df72eb30fb5b52b63aa3095aa509ad114d3d8fe
author Hall Liu <hallliu@google.com> Fri Feb 02 08:14:19 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 02 08:14:19 2018 +0000
tree 0e10c80cab354dca9dc9769532f483517362806b
parent 38a7cfd5a0acd0efa7df1bfc765159c122459b6a
parent 1bd119225caf3f0d0ff9d22ba7f5257e6f83fd41

Merge "No longer set CONFERENCE_HAS_NO_CHILDREN on SRVCC" am: 92cad26e83 am: 10504fb108
am: 1bd119225c

Change-Id: I625e108cdd77465962996c634aceb065930c38c5

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

diff --git a/src/com/android/services/telephony/GsmConnection.java b/src/com/android/services/telephony/GsmConnection.java
index 0a58fba..999c6f5 100644
--- a/src/com/android/services/telephony/GsmConnection.java
+++ b/src/com/android/services/telephony/GsmConnection.java
@@ -81,12 +81,6 @@
             }
         }
 
-        // For GSM connections, CAPABILITY_CONFERENCE_HAS_NO_CHILDREN should be applied whenever
-        // PROPERTY_IS_DOWNGRADED_CONFERENCE is true.
-        if ((getConnectionProperties() & PROPERTY_IS_DOWNGRADED_CONFERENCE) != 0) {
-            capabilities |= CAPABILITY_CONFERENCE_HAS_NO_CHILDREN;
-        }
-
         return capabilities;
     }
 

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 d523787..72184c4 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -910,7 +910,6 @@
                         mConferenceHost.isOutgoingCall());
                 // 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();