tree 4e547f3404944c7447f65c8c89afca948f6761fc
parent 4b2da35108aa7786b211b2102a8e5a60635eda27
author rongmei.li <rongmei.li@unisoc.com> 1583217066 +0800
committer rongmei.li <rongmei.li@unisoc.com> 1583217273 +0800

 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