tree fd69e15f740ea60f55c32ef53908fc5c10feead5
parent 9b68c5d930ec69868d7c273e1d3521cd60e818a9
author Tyler Gunn <tgunn@google.com> 1427927971 -0700
committer Tyler Gunn <tgunn@google.com> 1427927971 -0700

Prevent merging conference calls hosted on peer device.

With IMS, the "multiparty" bit on an ImsCall is set to "true" when a call
is merged into a conference.  This not only occurs on the device hosting
the conference call, but also on the devices of the callers merged into
the conference.

This CL changes the TelephonyConnection to listen to multipart state
changes reported by the ImsPhoneConnection.  It uses this to notify the
ImsConferenceController when a conference has started.  Note: the handler
is re-used to ensure the conference creation happens on the correct thread.
PhoneBase#checkCorrectThread would error out during creation of the
conference otherwise.

Modified ImsConferenceController to check for conferences which are not
conference hosts and to exclude them from the list of conferenceables.
We also exclude connections marked as multiparty which are not a conference
host (it is possible we have not yet turned these into a conference yet).

Bug: 19478784
Change-Id: I15c39e9c922c8a71e30f210f212e0ec779f5f939