commit 234a9b9a6eeea676fd6bd1780ddeebaaba5202a9
author rongmei.li <rongmei.li@unisoc.com> Tue Mar 03 14:31:06 2020 +0800
committer rohan <purohit.rohan@gmail.com> Tue May 26 08:21:12 2020 -0400
tree b7c849851a3d529112bf2e665896ddeb1be52a75
parent 6a485855ec40fc535efa0d7ed681cffd96c5743d

 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

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

diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java
index f9afd2d..76d3e8b 100644
--- a/java/com/android/incallui/call/DialerCall.java
+++ b/java/com/android/incallui/call/DialerCall.java
@@ -344,6 +344,7 @@
               // 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: