tree 8078b947055cfdcaa9d44586570c3bc28a1f0d36
parent 72722b57659ef10dfac4923498651822c2508879
author Tyler Gunn <tgunn@google.com> 1422494514 -0800
committer Tyler Gunn <tgunn@google.com> 1422494514 -0800

Fixing conference merge where only one party is added to conference.

- Adding check in TelephonyConnection to check for changes to the
multiparty bit and notifying listeners (in this case the conference
controller.
- In ImsConferenceController Responding to the onConferenceStarted
callback from the IMS layer by checking if a new ImsConference needs to
be created.

Bug: 18960042
Change-Id: I8dd2f32c442895fd6126b83f2d8ac889fd468fad