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

Commit acb28a7a authored by Evan Charlton's avatar Evan Charlton Committed by Android (Google) Code Review
Browse files

Merge "Fix the build breakage (update API & javadocs)"

parents 748a3779 7960fd91

api/current.txt

+7 −1
Original line number Diff line number Diff line
@@ -27596,6 +27596,8 @@ package android.telecomm { 
    method protected void onAdapterAttached(android.telecomm.CallServiceAdapter);

    method public abstract void onAudioStateChanged(java.lang.String, android.telecomm.CallAudioState);

    method public final android.os.IBinder onBind(android.content.Intent);

    method public void onPostDialContinue(java.lang.String, boolean);

    method public void onPostDialWait(android.telecomm.Connection, java.lang.String);

    method public abstract void playDtmfTone(java.lang.String, char);

    method public abstract void reject(java.lang.String);

    method public abstract void setIncomingCallId(java.lang.String, android.os.Bundle);
@@ -27607,6 +27609,7 @@ package android.telecomm { 
    method public void handleFailedOutgoingCall(android.telecomm.ConnectionRequest, int, java.lang.String);

    method public void handleSuccessfulOutgoingCall(java.lang.String);

    method public void notifyIncomingCall(android.telecomm.CallInfo);

    method public void onPostDialWait(java.lang.String, java.lang.String);

    method public void setActive(java.lang.String);

    method public void setDialing(java.lang.String);

    method public void setDisconnected(java.lang.String, int, java.lang.String);
@@ -27684,6 +27687,7 @@ package android.telecomm { 
    method protected void onDisconnect();

    method protected void onHold();

    method protected void onPlayDtmfTone(char);

    method protected void onPostDialContinue(boolean);

    method protected void onReject();

    method protected void onSetAudioState(android.telecomm.CallAudioState);

    method protected void onSetSignal(android.os.Bundle);
@@ -27754,6 +27758,8 @@ package android.telecomm { 
    method public void onCreateConnections(android.telecomm.ConnectionRequest, android.telecomm.Response<android.telecomm.ConnectionRequest, android.telecomm.Connection>);

    method public void onCreateIncomingConnection(android.telecomm.ConnectionRequest, android.telecomm.Response<android.telecomm.ConnectionRequest, android.telecomm.Connection>);

    method public void onFindSubscriptions(android.net.Uri, android.telecomm.Response<android.net.Uri, android.telecomm.Subscription>);

    method public final void onPostDialContinue(java.lang.String, boolean);

    method public final void onPostDialWait(android.telecomm.Connection, java.lang.String);

    method public final void playDtmfTone(java.lang.String, char);

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

    method public final void setIncomingCallId(java.lang.String, android.os.Bundle);
@@ -27778,7 +27784,7 @@ package android.telecomm { 
    method public void holdCall(java.lang.String);

    method public void mute(boolean);

    method public void playDtmfTone(java.lang.String, char);

    method public void postDialContinue(java.lang.String);

    method public void postDialContinue(java.lang.String, boolean);

    method public void rejectCall(java.lang.String);

    method public void setAudioRoute(int);

    method public void stopDtmfTone(java.lang.String);

telecomm/java/android/telecomm/InCallService.java

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ public abstract class InCallService extends Service { 
     * {@link #setPostDial(String,String)} state but is now waiting for user confirmation before the

     * remaining digits can be sent. Normal transitions are to {@link #setPostDial(String,String)}

     * when the user asks Telecomm to proceed with the post-dial sequence and the in-call app

     * informs Telecomm of this by invoking {@link InCallAdapter#postDialContinue(String)}.

     * informs Telecomm of this by invoking {@link InCallAdapter#postDialContinue(String,boolean)}.

     *

     * @param callId The identifier of the call changing state.

     * @param remaining The remaining postdial string to be dialed.