diff options
| author | rongmei.li <rongmei.li@unisoc.com> | 2020-03-03 14:31:06 +0800 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-12-12 01:23:35 +0200 |
| commit | e729d8bcc96364efb2b1c6ef137e1669d2fd8b28 (patch) | |
| tree | 301e2d4551cef8e57c5a100c9777f3d6d4c4c1b6 | |
| parent | f5251dc6b9f65a458114c266ce11757184fc22a1 (diff) | |
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
| -rw-r--r-- | java/com/android/incallui/call/DialerCall.java | 1 |
1 files changed, 1 insertions, 0 deletions
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: |