Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change signature of requestBluetoothAudio"

Browse Source
This commit is contained in:
Hall Liu
2018-04-03 00:14:58 +00:00
committed by Gerrit Code Review
parent e34c426fd3 1539283965
commit 545e20389d
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -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";

11
telecomm/java/android/telecom/Connection.java
View File

@@ -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());
} }
} }

7
telecomm/java/android/telecom/InCallService.java
View File

@@ -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());
} }
} }