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

Commit 7850a8ff authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Hide adhoc conference APIs." into rvc-dev am: f0edfb41 am: d5d36b6f 

Change-Id: I3286356bd199eb4943f0c2a98009efb5e74084fc
parents 67f8d55c d5d36b6f

api/current.txt

+0 −4
Original line number Diff line number Diff line
@@ -45923,13 +45923,9 @@ package android.telecom { 
    method public void onConference(android.telecom.Connection, android.telecom.Connection);

    method public void onConnectionServiceFocusGained();

    method public void onConnectionServiceFocusLost();

    method @Nullable public android.telecom.Conference onCreateIncomingConference(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest);

    method public void onCreateIncomingConferenceFailed(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest);

    method public android.telecom.Connection onCreateIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);

    method public void onCreateIncomingConnectionFailed(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);

    method public android.telecom.Connection onCreateIncomingHandoverConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);

    method @Nullable public android.telecom.Conference onCreateOutgoingConference(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest);

    method public void onCreateOutgoingConferenceFailed(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest);

    method public android.telecom.Connection onCreateOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);

    method public void onCreateOutgoingConnectionFailed(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);

    method public android.telecom.Connection onCreateOutgoingHandoverConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);

telecomm/java/android/telecom/ConnectionService.java

+4 −0
Original line number Diff line number Diff line
@@ -2633,6 +2633,7 @@ public abstract class ConnectionService extends Service { 
     * @param request Details about the incoming call.

     * @return The {@code Connection} object to satisfy this call, or {@code null} to

     *         not handle the call.

     * @hide

     */

    public @Nullable Conference onCreateIncomingConference(

            @Nullable PhoneAccountHandle connectionManagerPhoneAccount,
@@ -2717,6 +2718,7 @@ public abstract class ConnectionService extends Service { 
     * @param connectionManagerPhoneAccount See description at

     *         {@link #onCreateOutgoingConnection(PhoneAccountHandle, ConnectionRequest)}.

     * @param request The incoming connection request.

     * @hide

     */

    public void onCreateIncomingConferenceFailed(

            @Nullable PhoneAccountHandle connectionManagerPhoneAccount,
@@ -2737,6 +2739,7 @@ public abstract class ConnectionService extends Service { 
     * @param connectionManagerPhoneAccount See description at

     *         {@link #onCreateOutgoingConnection(PhoneAccountHandle, ConnectionRequest)}.

     * @param request The outgoing connection request.

     * @hide

     */

    public void onCreateOutgoingConferenceFailed(

            @Nullable PhoneAccountHandle connectionManagerPhoneAccount,
@@ -2805,6 +2808,7 @@ public abstract class ConnectionService extends Service { 
     * @param request Details about the outgoing call.

     * @return The {@code Conference} object to satisfy this call, or the result of an invocation

     *         of {@link Connection#createFailedConnection(DisconnectCause)} to not handle the call.

     * @hide

     */

    public @Nullable Conference onCreateOutgoingConference(

            @Nullable PhoneAccountHandle connectionManagerPhoneAccount,