AudioService: fix A2DP disconnection / reconnection

Fix issue introduced by commit d32a94d where in case of an
A2DP disconnection, the device was disconnected then reconnected.

Bug: 146544156
Test: disconnect A2DP device, check it's not listed in dumpsys media.audio_policy
Change-Id: Ic5f9387194d92a7a050e7a295a13a9ae18cd96ce
This commit is contained in:
Jean-Michel Trivi
2019-12-19 11:32:44 -08:00
parent bdc465991f
commit e168a3f0eb

View File

@@ -195,15 +195,17 @@ public class AudioDeviceInventory {
} else {
makeA2dpDeviceUnavailableNow(address, di.mDeviceCodecFormat);
}
} else if (state == BluetoothProfile.STATE_CONNECTED) {
// device is not already connected
if (a2dpVolume != -1) {
mDeviceBroker.postSetVolumeIndexOnDevice(AudioSystem.STREAM_MUSIC,
// convert index to internal representation in VolumeStreamState
a2dpVolume * 10,
AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, "onSetA2dpSinkConnectionState");
}
makeA2dpDeviceAvailable(address, BtHelper.getName(btDevice),
"onSetA2dpSinkConnectionState", a2dpCodec);
}
if (a2dpVolume != -1) {
mDeviceBroker.postSetVolumeIndexOnDevice(AudioSystem.STREAM_MUSIC,
// convert index to internal representation in VolumeStreamState
a2dpVolume * 10,
AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, "onSetA2dpSinkConnectionState");
}
makeA2dpDeviceAvailable(address, BtHelper.getName(btDevice),
"onSetA2dpSinkConnectionState", a2dpCodec);
}
}