commit a91b1e8d928cc575781f04ece988dd6674aa3fa6
author Tyler Gunn <tgunn@google.com> Tue Mar 31 20:49:52 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 31 20:49:52 2020 +0000
tree 446e31542fea72da1b1d932bad3635ba996cd252
parent 49e21f4d65644c1ebf043386d490064255b1f1f0
parent 4a7630811f8ceede3b64c0ccbe1971a4ece80728

Merge " Failed to show hold call when user click swap and merge simultaneously" am: 017fa0a742 am: fe0fb0e663 am: 307fdf3941 am: 92d0181edb am: 4a7630811f

Change-Id: Id260b2a83f2dfaed792177207f52105231347ead

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: