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

Commit 15392839 authored by Hall Liu's avatar Hall Liu
Browse files

Change signature of requestBluetoothAudio

requestBluetoothAudio now takes a BluetoothDevice instead of a string.

Bug: 74408978
Test: unable to CTS -- can't emulate bluetooth devices
Change-Id: Id21e32b911da234f69a248e9937f9df0cf12a9a9
parent de57d0d0
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -39390,7 +39390,7 @@ package android.telecom {
    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.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 final void sendRemoteRttRequest();
    method public final void sendRttInitiationFailure(int);
@@ -39601,7 +39601,7 @@ package android.telecom {
    method public void onCanAddCallChanged(boolean);
    method public void onConnectionEvent(android.telecom.Call, java.lang.String, android.os.Bundle);
    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 setMuted(boolean);
    field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.InCallService";
+5 −6
Original line number 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
     * 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.
@@ -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
     * self-managed {@link Connection} (see {@link PhoneAccount#CAPABILITY_SELF_MANAGED}.)
     * <p>
     * See also {@link InCallService#requestBluetoothAudio(String)}
     * @param bluetoothAddress The address of the bluetooth device to connect to, as returned by
     *                         {@link BluetoothDevice#getAddress()}.
     * See also {@link InCallService#requestBluetoothAudio(BluetoothDevice)}
     * @param bluetoothDevice The bluetooth device to connect to.
     */
    public void requestBluetoothAudio(@NonNull String bluetoothAddress) {
    public void requestBluetoothAudio(@NonNull BluetoothDevice bluetoothDevice) {
        for (Listener l : mListeners) {
            l.onAudioRouteChanged(this, CallAudioState.ROUTE_BLUETOOTH, bluetoothAddress);
            l.onAudioRouteChanged(this, CallAudioState.ROUTE_BLUETOOTH,
                    bluetoothDevice.getAddress());
        }
    }

+3 −4
Original line number Diff line number Diff line
@@ -428,12 +428,11 @@ public abstract class InCallService extends Service {
     * A list of available devices can be obtained via
     * {@link CallAudioState#getSupportedBluetoothDevices()}
     *
     * @param bluetoothAddress The address of the bluetooth device to connect to, as returned by
     *                         {@link BluetoothDevice#getAddress()}.
     * @param bluetoothDevice The bluetooth device to connect to.
     */
    public final void requestBluetoothAudio(@NonNull String bluetoothAddress) {
    public final void requestBluetoothAudio(@NonNull BluetoothDevice bluetoothDevice) {
        if (mPhone != null) {
            mPhone.requestBluetoothAudio(bluetoothAddress);
            mPhone.requestBluetoothAudio(bluetoothDevice.getAddress());
        }
    }