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

Commit 256aa5af authored by Santos Cordon's avatar Santos Cordon Committed by Android (Google) Code Review
Browse files

Merge "Add APIs to support CDMA add-call limitations." into nyc-dev

parents ef417514 a6018b9b

api/current.txt

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

    method public final android.telecom.RemoteConnection createRemoteIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);

    method public final android.telecom.RemoteConnection createRemoteOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);

    method public final java.util.Collection<android.telecom.Conference> getAllConferences();

    method public final java.util.Collection<android.telecom.Connection> getAllConnections();

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

    method public void onConference(android.telecom.Connection, android.telecom.Connection);

api/system-current.txt

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

    method public final android.telecom.RemoteConnection createRemoteIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);

    method public final android.telecom.RemoteConnection createRemoteOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);

    method public final java.util.Collection<android.telecom.Conference> getAllConferences();

    method public final java.util.Collection<android.telecom.Connection> getAllConnections();

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

    method public void onConference(android.telecom.Connection, android.telecom.Connection);

api/test-current.txt

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

    method public final android.telecom.RemoteConnection createRemoteIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);

    method public final android.telecom.RemoteConnection createRemoteOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);

    method public final java.util.Collection<android.telecom.Conference> getAllConferences();

    method public final java.util.Collection<android.telecom.Connection> getAllConnections();

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

    method public void onConference(android.telecom.Connection, android.telecom.Connection);

telecomm/java/android/telecom/ConnectionService.java

+10 −0
Original line number Diff line number Diff line
@@ -1052,6 +1052,16 @@ public abstract class ConnectionService extends Service { 
        return mConnectionById.values();

    }



    /**

     * Returns all the active {@code Conference}s for which this {@code ConnectionService}

     * has taken responsibility.

     *

     * @return A collection of {@code Conference}s created by this {@code ConnectionService}.

     */

    public final Collection<Conference> getAllConferences() {

        return mConferenceById.values();

    }



    /**

     * Create a {@code Connection} given an incoming request. This is used to attach to existing

     * incoming calls.

telecomm/java/android/telecom/DisconnectCause.java

+1 −1
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ public final class DisconnectCause implements Parcelable { 
    /**

     * Creates a new DisconnectCause.

     *

     * @param label The localized label to show to the user to explain the disconnect.

     * @param code The code for the disconnect cause.

     * @param label The localized label to show to the user to explain the disconnect.

     * @param description The localized description to show to the user to explain the disconnect.

     * @param reason The reason for the disconnect.

     */