commit acc1a1d9162455d2188246d2e18c9a5ba985ee0c
author Tyler Gunn <tgunn@google.com> Mon Mar 26 20:32:05 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 26 20:32:05 2018 +0000
tree 64c49710352b6973369485e3db72f5bfab587503
parent 4e4cbf37fcfb996d92ec161c86d336d89d18218e
parent ac9b5e29875d24c9323eabaa97d858cd6e533393

Merge "IMS: Merge calls option not seen when refer failed"

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 4bae058..971dd7b 100644
--- a/src/com/android/services/telephony/ImsConferenceController.java
+++ b/src/com/android/services/telephony/ImsConferenceController.java
@@ -389,5 +389,8 @@
                         android.telephony.DisconnectCause.IMS_MERGED_SUCCESSFULLY)));
         connection.destroy();
         mImsConferences.add(conference);
+        // If one of the participants failed to join the conference, recalculate will set the
+        // conferenceable connections for the conference to show merge calls option.
+        recalculateConferenceable();
     }
 }