Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7890b99b authored by rongmei.li's avatar rongmei.li
Browse files

Failed to show hold call when user click swap and merge simultaneously 

Set EVENT_MERGE_START for foregroundConnection and backgroundConnection
but don't set EVENT_MERGE_COMPLETE when there is ImsException

Bug: 121105030

Change-Id: Ib376b24e5d307d8907d7ec2c8a3e025c04682d88
parent 4b2da351

java/com/android/incallui/call/DialerCall.java

+1 −0
Original line number Diff line number Diff line
@@ -344,6 +344,7 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa 
              // now update the UI to possibly re-enable the Merge button based on the number of

              // currently conferenceable calls available or Connection Capabilities.

            case android.telecom.Connection.EVENT_CALL_MERGE_FAILED:

              isMergeInProcess = false;

              update();

              break;

            case TelephonyManagerCompat.EVENT_HANDOVER_VIDEO_FROM_WIFI_TO_LTE: