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

Commit b865d3fa authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Ims: Handle conference call in DIALING state"

parents 976686b7 14f7db7c

telecomm/java/android/telecom/Conference.java

+8 −0
Original line number Diff line number Diff line
@@ -224,6 +224,13 @@ public abstract class Conference implements IConferenceable { 
        setState(Connection.STATE_HOLDING);

    }



    /**

     * Sets state to be dialing.

     */

    public final void setDialing() {

        setState(Connection.STATE_DIALING);

    }



    /**

     * Sets state to be active.

     */
@@ -433,6 +440,7 @@ public abstract class Conference implements IConferenceable { 


    private void setState(int newState) {

        if (newState != Connection.STATE_ACTIVE &&

                newState != Connection.STATE_DIALING &&

                newState != Connection.STATE_HOLDING &&

                newState != Connection.STATE_DISCONNECTED) {

            Log.w(this, "Unsupported state transition for Conference call.",