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

Commit 8ac54f16 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge \\"Add missing setPulling() method in Connection.\\" into nyc-mr1-dev am: 089e99ee 

am: 2251dda7

Change-Id: Id924dc5335527b727c7fde31a581f68dac01808c
parents 2726f482 2251dda7

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -36306,6 +36306,7 @@ package android.telecom { 
    method public final void setNextPostDialChar(char);

    method public final void setNextPostDialChar(char);

    method public final void setOnHold();

    method public final void setOnHold();

    method public final void setPostDialWait(java.lang.String);

    method public final void setPostDialWait(java.lang.String);

    method public final void setPulling();

    method public final void setRingbackRequested(boolean);

    method public final void setRingbackRequested(boolean);

    method public final void setRinging();

    method public final void setRinging();

    method public final void setStatusHints(android.telecom.StatusHints);

    method public final void setStatusHints(android.telecom.StatusHints);

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -39156,6 +39156,7 @@ package android.telecom { 
    method public final void setNextPostDialChar(char);

    method public final void setNextPostDialChar(char);

    method public final void setOnHold();

    method public final void setOnHold();

    method public final void setPostDialWait(java.lang.String);

    method public final void setPostDialWait(java.lang.String);

    method public final void setPulling();

    method public final void setRingbackRequested(boolean);

    method public final void setRingbackRequested(boolean);

    method public final void setRinging();

    method public final void setRinging();

    method public final void setStatusHints(android.telecom.StatusHints);

    method public final void setStatusHints(android.telecom.StatusHints);

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -36384,6 +36384,7 @@ package android.telecom { 
    method public final void setNextPostDialChar(char);

    method public final void setNextPostDialChar(char);

    method public final void setOnHold();

    method public final void setOnHold();

    method public final void setPostDialWait(java.lang.String);

    method public final void setPostDialWait(java.lang.String);

    method public final void setPulling();

    method public final void setRingbackRequested(boolean);

    method public final void setRingbackRequested(boolean);

    method public final void setRinging();

    method public final void setRinging();

    method public final void setStatusHints(android.telecom.StatusHints);

    method public final void setStatusHints(android.telecom.StatusHints);

telecomm/java/android/telecom/Connection.java

+10 −0
Original line number Original line Diff line number Diff line
@@ -1671,6 +1671,16 @@ public abstract class Connection extends Conferenceable { 
        setState(STATE_DIALING);

        setState(STATE_DIALING);

    }

    }





    /**

     * Sets state to pulling (e.g. the connection is being pulled to the local device from another

     * device).  Only applicable for {@link Connection}s with

     * {@link Connection#PROPERTY_IS_EXTERNAL_CALL} and {@link Connection#CAPABILITY_CAN_PULL_CALL}.

     */

    public final void setPulling() {

        checkImmutable();

        setState(STATE_PULLING_CALL);

    }



    /**

    /**

     * Sets state to be on hold.

     * Sets state to be on hold.

     */

     */