commit 017fa0a7420986708835f3ce7f2e87df233065d4
author Tyler Gunn <tgunn@google.com> Tue Mar 31 16:43:13 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 31 16:43:13 2020 +0000
tree ff880cafbf3630777a5cdf11f1a8ce1fc9e60e9a
parent 9cbdb82e0d061084cc9c6cf8e80768711350a541
parent 7890b99b3a79a21b101b0f7bcd7454421ec95791

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

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: