AVRCP: Store and remove absolute volume support and volume stored
1. Store abs volume support when remote will update in RC feature.
2. getVolume will return default volume if volume is not stored.
3. Remove stored volume and abs volume support when bond state changed.
CRs-Fixed: 2519504
Change-Id: Ib2724f6be7225070769ffde947e60fc8f81b4d58
diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index 49623c0..f4412cc 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -176,7 +176,9 @@
private int changePathDepth;
private byte changePathDirection;
HashMap<BluetoothDevice, Integer> mVolumeMap = new HashMap();
+ HashMap<BluetoothDevice, Boolean> mDeviceAbsVolMap = new HashMap();
public static final String VOLUME_MAP = "bluetooth_volume_map";
+ public static final String ABS_VOL_MAP = "bluetooth_ABS_VOL_map";
private boolean isShoActive = false;
AudioManagerAudioDeviceCallback mAudioManagerAudioDeviceCallback;
private boolean twsShoEnabled = false;
@@ -842,8 +844,6 @@
BluetoothDevice device = mA2dpService.getActiveDevice();
if(device == null)
break;
- mAudioManager.avrcpSupportsAbsoluteVolume(device.getAddress(),
- isAbsoluteVolumeSupported(deviceIndex));
if (mAbsVolThreshold > 0 && mAbsVolThreshold < mAudioStreamMax &&
vol > mAbsVolThreshold) {
if (DEBUG) Log.v(TAG, "remote inital volume too high " + vol + ">" +
@@ -905,6 +905,20 @@
deviceFeatures[deviceIndex].isAbsoluteVolumeSupportingDevice =
((deviceFeatures[deviceIndex].mFeatures &
BTRC_FEAT_ABSOLUTE_VOLUME) != 0);
+ //store Absolute volume support
+ Log.d(TAG,"absolute volume support device is present " + mDeviceAbsVolMap.containsKey(deviceFeatures[deviceIndex].mCurrentDevice));
+ if (!mDeviceAbsVolMap.containsKey(deviceFeatures[deviceIndex].mCurrentDevice) ||
+ (mDeviceAbsVolMap.containsKey(deviceFeatures[deviceIndex].mCurrentDevice) &&
+ mDeviceAbsVolMap.get(deviceFeatures[deviceIndex].mCurrentDevice) !=
+ deviceFeatures[deviceIndex].isAbsoluteVolumeSupportingDevice)) {
+ SharedPreferences.Editor absVolumeMapEditor = getAbsVolumeMap().edit();
+ mDeviceAbsVolMap.put(deviceFeatures[deviceIndex].mCurrentDevice, (boolean)deviceFeatures[deviceIndex].isAbsoluteVolumeSupportingDevice);
+ absVolumeMapEditor.putBoolean(deviceFeatures[deviceIndex].mCurrentDevice.getAddress(), deviceFeatures[deviceIndex].isAbsoluteVolumeSupportingDevice);
+ // Always use apply() since it is asynchronous, otherwise the call can hang waiting for
+ // storage to be written.
+ absVolumeMapEditor.apply();
+ Log.d(TAG,"absolute volume support data saved");
+ }
BATService mBatService = BATService.getBATService();
if ((mBatService != null) && mBatService.isBATActive()) {
Log.d(TAG,"MSG_NATIVE_REQ_GET_RC_FEATURES BA Active, update absvol support as true ");
@@ -1252,26 +1266,12 @@
/*Avoid send set absolute volume for store volume untill volume registration
complete and making synchronization to send only one setAbsolute volume
during connection*/
- if(getVolume(deviceFeatures[deviceIndex].mCurrentDevice) != -1) {
+ int val = getVolume(deviceFeatures[deviceIndex].mCurrentDevice);
+ if (val != volIndex) {
deviceFeatures[deviceIndex].mRemoteVolume = absVol;
setAbsVolumeFlag(deviceFeatures[deviceIndex].mCurrentDevice);
break;
}
- /*if volume is stored than no need to send setAbsoluteVolume use register volume*/
- else if(mAbsVolThreshold > 0 && mAbsVolThreshold < mAudioStreamMax &&
- volIndex > mAbsVolThreshold) {
- //To handle volume when device volume is not stored during
- // paring
- if (DEBUG) Log.v(TAG, "remote inital volume too high " + volIndex + ">" +
- mAbsVolThreshold);
- Message msg1 = mHandler.obtainMessage(MSG_SET_ABSOLUTE_VOLUME,
- mAbsVolThreshold , 0);
- mHandler.sendMessage(msg1);
- deviceFeatures[deviceIndex].mRemoteVolume = absVol;
- deviceFeatures[deviceIndex].mLocalVolume = volIndex;
- deviceFeatures[deviceIndex].mLastRequestedVolume = -1;
- break;
- }
}
}
if (deviceFeatures[deviceIndex].mLocalVolume != volIndex &&
@@ -3322,6 +3322,12 @@
SharedPreferences.Editor editor = pref.edit();
editor.putBoolean(mAddress, true);
editor.commit();
+ SharedPreferences.Editor absVolumeMapEditor = getAbsVolumeMap().edit();
+ mDeviceAbsVolMap.put(deviceFeatures[i].mCurrentDevice, false);
+ absVolumeMapEditor.putBoolean(mAddress, false);
+ // Always use apply() since it is asynchronous, otherwise the call can hang waiting for
+ // storage to be written.
+ absVolumeMapEditor.apply();
Log.v(TAG, "Exit blackListCurrentDevice");
}
@@ -3343,9 +3349,26 @@
public void resetBlackList(String address) {
SharedPreferences pref = mContext.getSharedPreferences(ABSOLUTE_VOLUME_BLACKLIST,
Context.MODE_PRIVATE);
+ if (!pref.contains(address)) {
+ Log.v(TAG, "resetBlackList : device is not added in blacklist");
+ return;
+ }
SharedPreferences.Editor editor = pref.edit();
editor.remove(address);
editor.apply();
+ SharedPreferences.Editor absVolumeMapEditor = getAbsVolumeMap().edit();
+ BluetoothDevice device = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(address);
+ if (device != null && device.getBondState() == BluetoothDevice.BOND_NONE) {
+ Log.v(TAG, "resetBlackList : device state is unbonded");
+ return;
+ }
+ mDeviceAbsVolMap.put(device, true);
+ absVolumeMapEditor.putBoolean(address, true);
+ // Always use apply() since it is asynchronous, otherwise the call can hang waiting for
+ // storage to be written.
+ absVolumeMapEditor.apply();
+ //updating audio for absolute volume support
+ mAudioManager.avrcpSupportsAbsoluteVolume(address, true);
}
/**
@@ -5163,7 +5186,34 @@
}
return INVALID_DEVICE_INDEX;
}
+
+ public void removeVolumeForDevice(BluetoothDevice device) {
+ if (device == null || device.getBondState() != BluetoothDevice.BOND_NONE)
+ return;
+ SharedPreferences.Editor pref = getVolumeMap().edit();
+ SharedPreferences.Editor prefAbs = getAbsVolumeMap().edit();
+ Log.i(TAG, "RemoveStoredVolume: Remove stored stream volume level and abs volume support for device " + device);
+ mVolumeMap.remove(device);
+ pref.remove(device.getAddress());
+ // Always use apply() since it is asynchronous, otherwise the call can hang waiting for
+ // storage to be written.
+ pref.apply();
+ //remove absoute volume support
+ mDeviceAbsVolMap.remove(device);
+ prefAbs.remove(device.getAddress());
+ // Always use apply() since it is asynchronous, otherwise the call can hang waiting for
+ // storage to be written.
+ prefAbs.apply();
+ }
+
public void storeVolumeForDevice(BluetoothDevice device) {
+ /*Due to race condtion between active device change and bond state change, if bond state
+ change event handled first and active device change later than volume will not stored
+ if bond state is not paired */
+ if (device != null && device.getBondState() == BluetoothDevice.BOND_NONE) {
+ Log.i(TAG, "storeVolume: not saved because bond state is none");
+ return;
+ }
SharedPreferences.Editor pref = getVolumeMap().edit();
int index = getIndexForDevice(device);
int storeVolume = mAudioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
@@ -5281,6 +5331,10 @@
return mContext.getSharedPreferences(VOLUME_MAP, Context.MODE_PRIVATE);
}
+ private SharedPreferences getAbsVolumeMap() {
+ return mContext.getSharedPreferences(ABS_VOL_MAP, Context.MODE_PRIVATE);
+ }
+
private void Avrcp_extVolumeManager() {
// Load the stored volume preferences into a hash map since shared preferences are slow
// to poll and update. If the device has been unbonded since last start remove it from
@@ -5301,12 +5355,29 @@
}
}
volumeMapEditor.apply();
+
+ allKeys = getAbsVolumeMap().getAll();
+ SharedPreferences.Editor absVolumeMapEditor = getAbsVolumeMap().edit();
+ for (Map.Entry<String, ?> entry : allKeys.entrySet()) {
+ String key = entry.getKey();
+ Object value = entry.getValue();
+ BluetoothDevice d = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(key);
+
+ if (value instanceof Boolean && d.getBondState() == BluetoothDevice.BOND_BONDED) {
+ mDeviceAbsVolMap.put(d, (Boolean) value);
+ Log.w(TAG, "Address " + key + " from the absolute volume map support :" + value);
+ } else {
+ Log.w(TAG, "Removing " + key + " from the absolute volume map support state" + d.getBondState());
+ absVolumeMapEditor.remove(key);
+ }
+ }
+ absVolumeMapEditor.apply();
}
public int getVolume(BluetoothDevice device) {
if (!mVolumeMap.containsKey(device)) {
Log.w(TAG, "getVolume: Couldn't find volume preference for device: " + device);
- return -1;
+ return mAudioStreamMax/2;
}
Log.d(TAG, "getVolume: Returning volume " + mVolumeMap.get(device));
return mVolumeMap.get(device);
@@ -5314,19 +5385,26 @@
public void setAbsVolumeFlag(BluetoothDevice device) {
int deviceIndex = getIndexForDevice(device);
+ int volume = getVolume(device);
+ Log.d(TAG, " device allocated for abs volume support " + mDeviceAbsVolMap.containsKey(device));
+ if (mDeviceAbsVolMap.containsKey(device)) {
+ //updating abs volume supported or not to audio when active device change is success
+ Log.d(TAG, " Returning abs volume support " + mDeviceAbsVolMap.get(device));
+ mAudioManager.avrcpSupportsAbsoluteVolume(device.getAddress(), mDeviceAbsVolMap.get(device));
+ } else {
+ //absolute volume is not stored upadtion false by default
+ Log.d(TAG, "Returning abs volume support false ");
+ mAudioManager.avrcpSupportsAbsoluteVolume(device.getAddress(), false);
+ }
if (deviceIndex == INVALID_DEVICE_INDEX) {
Log.e(TAG,"Invalid device index for setAbsVolumeFlag");
return;
}
- int volume = getVolume(device);
- //updating abs volume supported or not to audio when active device change is success
- mAudioManager.avrcpSupportsAbsoluteVolume(device.getAddress(),
- isAbsoluteVolumeSupported(deviceIndex));
if(deviceFeatures[deviceIndex].isAbsoluteVolumeSupportingDevice == false) {
Log.d(TAG,"isAbsoluteVolumeSupportingDevice is false or volume is not stored");
return;
}
- if(deviceFeatures[deviceIndex].mInitialRemoteVolume == -1 || volume == -1) {
+ if(deviceFeatures[deviceIndex].mInitialRemoteVolume == -1) {
Log.e(TAG,"intial volume is not updated or volume is not stored");
return;
}