Fixing disconnect tone heard when merging 3rd participant into conference.
authorTyler Gunn <tgunn@google.com>
Mon, 8 Dec 2014 17:56:17 +0000 (09:56 -0800)
committerTyler Gunn <tgunn@google.com>
Mon, 8 Dec 2014 17:56:17 +0000 (09:56 -0800)
commit87466c59b1980ec4e56bb17fae8b855efcc17fd8
tree13a32fb3b01ff4c7ff11d384c37b90e9de7680b5
parent095839a66699a128c76cd5002459fcba7c3a9a0d
Fixing disconnect tone heard when merging 3rd participant into conference.

The issue was when we set the merge peer/merge host.  We were always
setting the merge peer to the BG call.  This is fine when there is no
conference, but when we already have a conference we need to take into
account whether the FG or BG is the conference.

Bug: 18652342
Change-Id: I910a1bee3d3e04477861ed68f2a77a49d0da8471
src/java/com/android/ims/ImsCall.java