Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ae465ff authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Ims: Add support for Adhoc Conference calls" am: 76e3fd40 am: 2e51f8e3 am: 155b947c 

Change-Id: Ifd436829c360728678cb021c405d41508eb2427c
parents 0e8bf3c3 155b947c

src/java/com/android/ims/ImsCall.java

+7 −0
Original line number Diff line number Diff line
@@ -1128,6 +1128,7 @@ public class ImsCall implements ICall { 


        synchronized(mLockObj) {

            mSession = session;

            mIsConferenceHost = true;



            try {

                session.setListener(createCallSessionListener());
@@ -2397,6 +2398,12 @@ public class ImsCall implements ICall { 
                return;

            }



            if (mIsConferenceHost) {

                // If the dial request was a adhoc conf calling one, this call would have

                // been marked the conference host as part of the request.

                mIsConferenceHost = false;

            }



            ImsCall.Listener listener;



            synchronized(ImsCall.this) {

src/java/com/android/ims/ImsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1951,7 +1951,7 @@ public class ImsManager implements IFeatureConnector { 
        call.setListener(listener);

        ImsCallSession session = createCallSession(profile);



        if ((callees != null) && (callees.length == 1)) {

        if ((callees != null) && (callees.length == 1) && !(session.isMultiparty())) {

            call.start(session, callees[0]);

        } else {

            call.start(session, callees);