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

Merge "AudioService: fix missing AUDIO_BECOMING_NOISY intent" into oc-dev

Browse Source 
am: d91cedb76d

Change-Id: I0d07b4cb37b9c35086e82bf06d55c99d47b267ad
This commit is contained in:
Eric Laurent
2017-04-28 18:51:10 +00:00
committed by android-build-merger
parent a0f1fb6b06 d91cedb76d
commit 82c6833c51
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -5149,7 +5149,7 @@ public class AudioService extends IAudioService.Stub
private void onBluetoothA2dpDeviceConfigChange(BluetoothDevice btDevice) private void onBluetoothA2dpDeviceConfigChange(BluetoothDevice btDevice)
{ {
if (DEBUG_VOL) { if (DEBUG_DEVICES) {
Log.d(TAG, "onBluetoothA2dpDeviceConfigChange btDevice=" + btDevice); Log.d(TAG, "onBluetoothA2dpDeviceConfigChange btDevice=" + btDevice);
} }
if (btDevice == null) { if (btDevice == null) {
@@ -5166,8 +5166,13 @@ public class AudioService extends IAudioService.Stub
final DeviceListSpec deviceSpec = mConnectedDevices.get(key); final DeviceListSpec deviceSpec = mConnectedDevices.get(key);
if (deviceSpec != null) { if (deviceSpec != null) {
// Device is connected // Device is connected
AudioSystem.handleDeviceConfigChange(device, address, if (AudioSystem.handleDeviceConfigChange(device, address,
btDevice.getName()); btDevice.getName()) != AudioSystem.AUDIO_STATUS_OK) {
// force A2DP device disconnection in case of error so that AudioService state is
// consistent with audio policy manager state
setBluetoothA2dpDeviceConnectionState(
btDevice, BluetoothA2dp.STATE_DISCONNECTED, BluetoothProfile.A2DP_SINK);
}
} }
} }
} }