Merge "Change signature of requestBluetoothAudio" am: 545e20389d

am: 442575f4f1

Change-Id: Ic10b762e04d74635663fa97f5879072ebe00eca9
This commit is contained in:
Hall Liu
2018-04-02 18:46:50 -07:00
committed by android-build-merger
3 changed files with 10 additions and 12 deletions

View File

@@ -2600,7 +2600,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.
@@ -2611,13 +2610,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());
}
}