Fixing conference merge where only one party is added to conference.
authorTyler Gunn <tgunn@google.com>
Fri, 30 Jan 2015 23:21:11 +0000 (15:21 -0800)
committerTyler Gunn <tgunn@google.com>
Fri, 30 Jan 2015 23:21:11 +0000 (15:21 -0800)
commit047d8101113030f34f89f7c9ba015d6c5c3abba6
tree5e0fa74f3c14499514c1463e804f3f013e735045
parentb5388a368811eb39ba2f25f1266208b72e62f280
Fixing conference merge where only one party is added to conference.

- revisit code to trigger processMergeComplete; we used to assume that we
were done merging when the transient session started.  We now have to
check on terminate and on hold to see if all the calls have been

Bug: 18960042
Change-Id: I682303558c6958d85d2358102757608041b8451e
src/java/com/android/ims/ImsCall.java
src/java/com/android/ims/internal/ImsCallSession.java