commit ab9a4f249201f6f8946d4ac22595a305632c8090
author lei.huang <lei.huang@unisoc.corp-partner.google.com> Thu Mar 14 10:04:06 2019 +0800
committer lei.huang <lei.huang@unisoc.corp-partner.google.com> Sat Nov 02 03:30:22 2019 +0000
tree 3e662b7bbdca3b41c6de809ab4915f8e18d24138
parent 8439d91e90b4e07d5b8282bd8149fcdf5b3d81cc

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

[root cause  ]conferenceable of active call is null
[changes     ]ImsConferenceController recalculateConferenceable when add active connection

Change-Id: I63eb06295169dd328af0fd76743583bda4c77445

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 b193c7f..9932fab 100644
--- a/src/com/android/services/telephony/ImsConferenceController.java
+++ b/src/com/android/services/telephony/ImsConferenceController.java
@@ -154,6 +154,7 @@
         connection.addConnectionListener(mConnectionListener);
         connection.addTelephonyConnectionListener(mTelephonyConnectionListener);
         recalculateConference();
+        recalculateConferenceable();
     }
 
     /**