From 9c227fe71f110060f43e6b52314542733094cff8 Mon Sep 17 00:00:00 2001 From: "rongmei.li" Date: Tue, 3 Mar 2020 14:31:06 +0800 Subject: 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java index 06bd9260e..b02894683 100644 --- a/java/com/android/incallui/call/DialerCall.java +++ b/java/com/android/incallui/call/DialerCall.java @@ -345,6 +345,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: -- cgit v1.2.3