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

Commit 0feb9c9c authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "IMS: Conference fixes" into mnc-dev

parents 9ed0c410 d46595a6

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30101,6 +30101,7 @@ package android.telecom { 
    method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);

    method public final void setConnectionCapabilities(int);

    method public final void setConnectionTime(long);

    method public final void setDialing();

    method public final void setDisconnected(android.telecom.DisconnectCause);

    method public final void setExtras(android.os.Bundle);

    method public final void setOnHold();

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32257,6 +32257,7 @@ package android.telecom { 
    method public final deprecated void setConnectTimeMillis(long);

    method public final void setConnectionCapabilities(int);

    method public final void setConnectionTime(long);

    method public final void setDialing();

    method public final void setDisconnected(android.telecom.DisconnectCause);

    method public final void setExtras(android.os.Bundle);

    method public final void setOnHold();

telecomm/java/android/telecom/Conference.java

+7 −0
Original line number Diff line number Diff line
@@ -294,6 +294,13 @@ public abstract class Conference extends Conferenceable { 
        setState(Connection.STATE_HOLDING);

    }



    /**

     * Sets state to be dialing.

     */

    public final void setDialing() {

        setState(Connection.STATE_DIALING);

    }



    /**

     * Sets state to be active.

     */