Avrcp: Replacing isActiveDevice from a2dp active device
When volume update will come before AVRCP active
device message handle than volume change will
ignored.
To handle volume registeration durining connection
replacing isActiveDevice check from a2dp active
device check.
CRs-Fixed: 2500646
Change-Id: I6fe047dca01a4b8f668d5fabf70e14c0aa4b9b7d
diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index 8308db7..55a989a 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -926,7 +926,7 @@
}
} else
mAudioManager.avrcpSupportsAbsoluteVolume(device.getAddress(), true);
- } else if (mDevice != null && mDevice.equals(device)) {
+ } else if (mDevice != null && Objects.equals(mDevice, device)) {
mAudioManager.avrcpSupportsAbsoluteVolume(device.getAddress(),
isAbsoluteVolumeSupported(deviceIndex));
Log.v(TAG,"update audio manager for abs vol state = "
@@ -1123,17 +1123,19 @@
Bundle data = msg.getData();
byte[] bdaddr = data.getByteArray("BdAddress");
String address = Utils.getAddressStringFromByte(bdaddr);
- BluetoothDevice device;
+ BluetoothDevice device, activeDevice = null;
Log.v(TAG, "event for device address " + address);
deviceIndex = getIndexForDevice(mAdapter.getRemoteDevice(address));
if (deviceIndex == INVALID_DEVICE_INDEX) {
Log.e(TAG,"invalid index for device");
break;
}
+ activeDevice = mA2dpService.getActiveDevice();
byte absVol = (byte) ((byte) msg.arg1 & 0x7f); // discard MSB as it is RFD
if (DEBUG) Log.v(TAG, "MSG_NATIVE_REQ_VOLUME_CHANGE addr: " + address);
- if (((!(deviceFeatures[deviceIndex].isActiveDevice)) &&
+ if (((!(activeDevice != null
+ && Objects.equals(deviceFeatures[deviceIndex].mCurrentDevice, activeDevice))) &&
(deviceFeatures[deviceIndex].mInitialRemoteVolume != -1)) ||
(!deviceFeatures[deviceIndex].isAbsoluteVolumeSupportingDevice)) {
if (deviceFeatures[deviceIndex].isAbsoluteVolumeSupportingDevice) {
@@ -1229,8 +1231,9 @@
deviceFeatures[deviceIndex].mInitialRemoteVolume = absVol;
//Avoid fluctuation of volume during device added in blacklist
// use send setAbsolute volume for blacklisted volume
- if(deviceFeatures[deviceIndex].mBlackListVolume != -1 &&
- deviceFeatures[deviceIndex].isActiveDevice) {
+ if (deviceFeatures[deviceIndex].mBlackListVolume != -1 &&
+ activeDevice != null &&
+ Objects.equals(activeDevice, deviceFeatures[deviceIndex].mCurrentDevice)) {
resetBlackList(address);
if (DEBUG) Log.v(TAG, "remote initial volume as audio stream volume : " +
deviceFeatures[deviceIndex].mBlackListVolume);
@@ -1242,7 +1245,8 @@
deviceFeatures[deviceIndex].mLocalVolume = deviceFeatures[deviceIndex].mBlackListVolume;
deviceFeatures[deviceIndex].mBlackListVolume = -1;
break;
- } else if (deviceFeatures[deviceIndex].isActiveDevice) {
+ } else if (activeDevice != null &&
+ Objects.equals(activeDevice, deviceFeatures[deviceIndex].mCurrentDevice)) {
/*Avoid send set absolute volume for store volume untill volume registration
complete and making synchronization to send only one setAbsolute volume
during connection*/
@@ -1283,7 +1287,8 @@
break;
}
/* If the volume has successfully changed */
- if (device != null && !deviceFeatures[deviceIndex].isActiveDevice &&
+ if (device != null && !(activeDevice != null &&
+ Objects.equals(activeDevice, deviceFeatures[deviceIndex].mCurrentDevice)) &&
(msg.arg2 == AVRC_RSP_CHANGED || msg.arg2 == AVRC_RSP_INTERIM)) {
Log.d(TAG, "Do not change volume from an inactive device");
break;
@@ -1343,10 +1348,12 @@
if (DEBUG) Log.v(TAG, "MSG_SET_ABSOLUTE_VOLUME");
int avrcpVolume = convertToAvrcpVolume(msg.arg1);
+ BluetoothDevice activeDevice = null;
avrcpVolume = Math.min(AVRCP_MAX_VOL, Math.max(0, avrcpVolume));
for (int i = 0; i < maxAvrcpConnections; i++) {
- if (deviceFeatures[i].mCurrentDevice != null &&
- deviceFeatures[i].isActiveDevice && deviceFeatures[i].isAbsoluteVolumeSupportingDevice) {
+ if (deviceFeatures[i].mCurrentDevice != null && activeDevice != null &&
+ Objects.equals(activeDevice, deviceFeatures[deviceIndex].mCurrentDevice) &&
+ deviceFeatures[i].isAbsoluteVolumeSupportingDevice) {
deviceIndex = i;
@@ -2909,9 +2916,10 @@
public boolean isAbsoluteVolumeSupported() {
boolean status = false;
+ BluetoothDevice activeDevice = mA2dpService.getActiveDevice();
for (int i = 0; i < maxAvrcpConnections; i++) {
- if (deviceFeatures[i].mCurrentDevice != null &&
- deviceFeatures[i].isActiveDevice) {
+ if (deviceFeatures[i].mCurrentDevice != null && activeDevice != null &&
+ Objects.equals(deviceFeatures[i].mCurrentDevice, activeDevice)) {
if ((deviceFeatures[i].mFeatures &
BTRC_FEAT_ABSOLUTE_VOLUME) != 0) {
status = true;