commit eb0a870e4549a20ec4eae60bffc5376a506a3657
author Hall Liu <hallliu@google.com> Wed Nov 06 20:54:11 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 06 20:54:11 2019 +0000
tree dcdb9eec8cef1040f12907aae4b5fee3e1a32f3b
parent 9b7d867a18440961d438fe15b59ef71c69addbcc
parent ab9a4f249201f6f8946d4ac22595a305632c8090

Merge "Issue 128554727: no merge option when press merge and swap buttons simultaneously."

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 315aaad..b7f7b92 100644
--- a/src/com/android/services/telephony/ImsConferenceController.java
+++ b/src/com/android/services/telephony/ImsConferenceController.java
@@ -147,6 +147,7 @@
         mTelephonyConnections.add(connection);
         connection.addTelephonyConnectionListener(mTelephonyConnectionListener);
         recalculateConference();
+        recalculateConferenceable();
     }
 
     /**