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

Commit 442575f4 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Change signature of requestBluetoothAudio" 

am: 545e2038

Change-Id: I9fc7399bf01bbe0c1def43cc9cf543c0000b827c
parents 6f63d051 545e2038

api/current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -39392,7 +39392,7 @@ package android.telecom { 
    method public final void putExtras(android.os.Bundle);

    method public final void putExtras(android.os.Bundle);

    method public final void removeExtras(java.util.List<java.lang.String>);

    method public final void removeExtras(java.util.List<java.lang.String>);

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

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

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

    method public void requestBluetoothAudio(android.bluetooth.BluetoothDevice);

    method public void sendConnectionEvent(java.lang.String, android.os.Bundle);

    method public void sendConnectionEvent(java.lang.String, android.os.Bundle);

    method public final void sendRemoteRttRequest();

    method public final void sendRemoteRttRequest();

    method public final void sendRttInitiationFailure(int);

    method public final void sendRttInitiationFailure(int);
@@ -39603,7 +39603,7 @@ package android.telecom { 
    method public void onCanAddCallChanged(boolean);

    method public void onCanAddCallChanged(boolean);

    method public void onConnectionEvent(android.telecom.Call, java.lang.String, android.os.Bundle);

    method public void onConnectionEvent(android.telecom.Call, java.lang.String, android.os.Bundle);

    method public void onSilenceRinger();

    method public void onSilenceRinger();

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

    method public final void requestBluetoothAudio(android.bluetooth.BluetoothDevice);

    method public final void setAudioRoute(int);

    method public final void setAudioRoute(int);

    method public final void setMuted(boolean);

    method public final void setMuted(boolean);

    field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.InCallService";

    field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.InCallService";

telecomm/java/android/telecom/Connection.java

+5 −6
Original line number Original line Diff line number Diff line
@@ -2598,7 +2598,6 @@ public abstract class Connection extends Conferenceable { 
    }

    }





    /**

    /**

     *

     * Request audio routing to a specific bluetooth device. Calling this method may result in

     * Request audio routing to a specific bluetooth device. Calling this method may result in

     * the device routing audio to a different bluetooth device than the one specified if the

     * the device routing audio to a different bluetooth device than the one specified if the

     * bluetooth stack is unable to route audio to the requested device.

     * bluetooth stack is unable to route audio to the requested device.
@@ -2609,13 +2608,13 @@ public abstract class Connection extends Conferenceable { 
     * Used by self-managed {@link ConnectionService}s which wish to use bluetooth audio for a

     * Used by self-managed {@link ConnectionService}s which wish to use bluetooth audio for a

     * self-managed {@link Connection} (see {@link PhoneAccount#CAPABILITY_SELF_MANAGED}.)

     * self-managed {@link Connection} (see {@link PhoneAccount#CAPABILITY_SELF_MANAGED}.)

     * <p>

     * <p>

     * See also {@link InCallService#requestBluetoothAudio(String)}

     * See also {@link InCallService#requestBluetoothAudio(BluetoothDevice)}

     * @param bluetoothAddress The address of the bluetooth device to connect to, as returned by

     * @param bluetoothDevice The bluetooth device to connect to.

     *                         {@link BluetoothDevice#getAddress()}.

     */

     */

    public void requestBluetoothAudio(@NonNull String bluetoothAddress) {

    public void requestBluetoothAudio(@NonNull BluetoothDevice bluetoothDevice) {

        for (Listener l : mListeners) {

        for (Listener l : mListeners) {

            l.onAudioRouteChanged(this, CallAudioState.ROUTE_BLUETOOTH, bluetoothAddress);

            l.onAudioRouteChanged(this, CallAudioState.ROUTE_BLUETOOTH,

                    bluetoothDevice.getAddress());

        }

        }

    }

    }

telecomm/java/android/telecom/InCallService.java

+3 −4
Original line number Original line Diff line number Diff line
@@ -428,12 +428,11 @@ public abstract class InCallService extends Service { 
     * A list of available devices can be obtained via

     * A list of available devices can be obtained via

     * {@link CallAudioState#getSupportedBluetoothDevices()}

     * {@link CallAudioState#getSupportedBluetoothDevices()}

     *

     *

     * @param bluetoothAddress The address of the bluetooth device to connect to, as returned by

     * @param bluetoothDevice The bluetooth device to connect to.

     *                         {@link BluetoothDevice#getAddress()}.

     */

     */

    public final void requestBluetoothAudio(@NonNull String bluetoothAddress) {

    public final void requestBluetoothAudio(@NonNull BluetoothDevice bluetoothDevice) {

        if (mPhone != null) {

        if (mPhone != null) {

            mPhone.requestBluetoothAudio(bluetoothAddress);

            mPhone.requestBluetoothAudio(bluetoothDevice.getAddress());

        }

        }

    }

    }