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

Commit a91b1e8d authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

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

Merge " Failed to show hold call when user click swap and merge simultaneously" am: 017fa0a7 am: fe0fb0e6 am: 307fdf39 am: 92d0181e am: 4a763081

Change-Id: Id260b2a83f2dfaed792177207f52105231347ead
parents 49e21f4d 4a763081

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: