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

Commit 454c1401 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Remove handover token."

parents 4c1c2d05 727c6bd7

telecomm/java/android/telecom/ConnectionService.java

+5 −13
Original line number Diff line number Diff line
@@ -99,25 +99,17 @@ public abstract class ConnectionService extends Service { 
     * be specified in the {@link ConnectionRequest#getExtras()} passed by Telecom when

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

     * <p>

     * Telecom will also specify {@link #EXTRA_HANDOVER_TOKEN} to provide a Telecom-specific opaque

     * token representing the ongoing call which is to be handed over.

     * <p>

     * When your {@link ConnectionService} receives this extra, it should communicate the

     * {@link #EXTRA_HANDOVER_TOKEN} to the other device's matching {@link ConnectionService}.  That

     * When your {@link ConnectionService} receives this extra, it should communicate the fact that

     * this is a handover to the other device's matching {@link ConnectionService}.  That

     * {@link ConnectionService} will continue the handover using

     * {@link TelecomManager#addNewIncomingCall(PhoneAccountHandle, Bundle)}, specifying

     * {@link TelecomManager#EXTRA_IS_HANDOVER} and {@link TelecomManager#EXTRA_HANDOVER_TOKEN}.

     * {@link TelecomManager#EXTRA_IS_HANDOVER}.  Telecom will match the phone numbers of the

     * handover call on the other device with ongoing calls for {@link ConnectionService}s which

     * support {@link PhoneAccount#EXTRA_SUPPORTS_HANDOVER_FROM}.

     * @hide

     */

    public static final String EXTRA_IS_HANDOVER = TelecomManager.EXTRA_IS_HANDOVER;



    /**

     * String extra used by Telecom when {@link #EXTRA_IS_HANDOVER} is true to provide an identifier

     * for the call to be handed over.

     * @hide

     */

    public static final String EXTRA_HANDOVER_TOKEN = TelecomManager.EXTRA_HANDOVER_TOKEN;



    // Flag controlling whether PII is emitted into the logs

    private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);

telecomm/java/android/telecom/TelecomManager.java

+1 −13
Original line number Diff line number Diff line
@@ -342,23 +342,11 @@ public class TelecomManager { 
     * to indicate to Telecom that the purpose of adding a new incoming call is to handover an

     * existing call from the user's device to a different {@link PhoneAccount}.

     * <p>

     * The caller must also include {@link #EXTRA_HANDOVER_TOKEN} to specify which existing call is

     * to be handed over.

     * The phone number of the call used by Telecom to determine which call should be handed over.

     * @hide

     */

    public static final String EXTRA_IS_HANDOVER = "android.telecom.extra.IS_HANDOVER";



    /**

     * String extra which identifies the existing call on the current device which will be handed

     * over.  This is a Telecom-specific opaque token; the caller should not make any assumptions

     * about its meaning or content.

     * <p>

     * Used alongside {@link #EXTRA_IS_HANDOVER} when calling

     * {@link #addNewIncomingCall(PhoneAccountHandle, Bundle)}.

     * @hide

     */

    public static final String EXTRA_HANDOVER_TOKEN = "android.telecom.extra.HANDOVER_TOKEN";



    /**

     * A boolean extra, which when set on the {@link Intent#ACTION_CALL} intent or on the bundle

     * passed into {@link #placeCall(Uri, Bundle)}, indicates that the call should be initiated with