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

Merge "Change signature of requestBluetoothAudio" am: 545e20389d

Browse Source 
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
parent 5ef26ddf60 442575f4f1
commit 2a74e5798d
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

@@ -40956,7 +40956,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);
@@ -41167,7 +41167,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";

11
telecomm/java/android/telecom/Connection.java
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());
}
}

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