tree b7c849851a3d529112bf2e665896ddeb1be52a75
parent 6a485855ec40fc535efa0d7ed681cffd96c5743d
author rongmei.li <rongmei.li@unisoc.com> 1583217066 +0800
committer rohan <purohit.rohan@gmail.com> 1590495672 -0400

 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