Implement plumbing for merge() related callback workflows.
authorAnthony Lee <anthonylee@google.com>
Thu, 30 Oct 2014 17:50:10 +0000 (10:50 -0700)
committerAnthony Lee <anthonylee@google.com>
Fri, 31 Oct 2014 19:30:02 +0000 (12:30 -0700)
commit71382693cbc81b1d131085f52d97879976706f55
tree91be5c97f76d5835b9c2baf7b3f26267fb52293c
parent67a843d7d44c1b3a87644389b33f842df1c08351
Implement plumbing for merge() related callback workflows.

Added support for a transient ImsCallSession that could eventually
turn into the underlying ImsCall when it turns into a newly minted
conference call. Also handled the series of callSessionMergeXXX()
series of call to properly set up the pluming for IMS conferences.

Also cleaned up/added some logging.

Lastly, the prototype for onCallMerged() was changed because, at this
level, there is no sensible value that we could return even
if we wanted to. No one uses this newCall parameter anyways.

Bug: 18056632
Change-Id: Ifd0e23571b8bc928f2fd365df6c2d5d0f9a65b50
src/java/com/android/ims/ImsCall.java