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

Commit 0e99c532 authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Hide adhoc conference APIs." am: 988ca64c 

Change-Id: If33e8de701253f04d6289de370cb1e5c7a3e5a91
parents c82e04e7 988ca64c

api/current.txt

+0 −4
Original line number Diff line number Diff line
@@ -44061,13 +44061,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
@@ -2641,6 +2641,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,
@@ -2725,6 +2726,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,
@@ -2745,6 +2747,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,
@@ -2813,6 +2816,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,