commit 05e18846dea257978458c80bd690ce29e49ee5eb
author Diego Wilson <diegowilson@google.com> Tue Mar 03 17:17:05 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 03 17:17:05 2020 +0000
tree 80a8e49f7911a59696ba3ebc6aa26a7087cf5c82
parent 0ce4f096ba2403454fb4aaee7c005c02c02219f1
parent 8dd1fc861f2053288fa17b59a9cc724a23591e7a

Merge "Merge RP1A.200221.003" into r-keystone-qcom-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 d4815bf..ca91b60 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -1431,6 +1431,17 @@
     }
 
     /**
+     * @return {@code true} if the carrier associated with the conference supports multianchor
+     * conference, {@code false} otherwise.
+     */
+    public boolean isMultiAnchorConferenceSupported() {
+        PersistableBundle b = getCarrierConfig();
+        // Return false if the CarrierConfig is unavailable
+        return b != null && b.getBoolean(
+                CarrierConfigManager.KEY_CARRIER_SUPPORTS_MULTIANCHOR_CONFERENCE);
+    }
+
+    /**
      * @return The maximum size of a conference call where
      * {@link #isMaximumConferenceSizeEnforced()} is true.
      */

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

diff --git a/src/com/android/services/telephony/ImsConferenceController.java b/src/com/android/services/telephony/ImsConferenceController.java
index 8789ba8..aa3f783 100644
--- a/src/com/android/services/telephony/ImsConferenceController.java
+++ b/src/com/android/services/telephony/ImsConferenceController.java
@@ -266,7 +266,8 @@
                 Log.d(this, "recalc - %s %s", conference.getState(), conference);
             }
 
-            if (!conference.isConferenceHost()) {
+            if (!conference.isConferenceHost() &&
+                    (!conference.isMultiAnchorConferenceSupported())) {
                 if (Log.VERBOSE) {
                     Log.v(this, "skipping conference (not hosted on this device): %s", conference);
                 }

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

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 6c3b96b..a690208 100755
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -1479,6 +1479,7 @@
             mWasImsConnection = true;
         } else {
             extrasToRemove.add(QtiImsExtUtils.QTI_IMS_PHONE_ID_EXTRA_KEY);
+            extrasToRemove.add(QtiImsExtUtils.EXTRA_TIR_OVERWRITE_ALLOWED);
         }
 
         mIsMultiParty = mOriginalConnection.isMultiparty();