Revert "BT: Never store value greater than threshold volume"
This reverts commit 5eb33357ab7e9111cd647f9b74d68ef4ed040b7c.
CRs-Fixed: 2576723
Change-Id: I4d9912b5ee76224d807d297034c572a4bb752844
diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index 8f07abb..33a75da 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -142,7 +142,6 @@
/* Local volume in audio index 0-15 */
private int mLocalVolume;
private int mLastLocalVolume;
- private int mAbsVolThreshold;
private boolean mFastforward;
private boolean mRewind;
@@ -277,7 +276,6 @@
private SortedMap<Integer, MediaPlayerInfo_ext> mMediaPlayerInfoList;
private boolean mAvailablePlayerViewChanged;
- private boolean mPlayerSwitching;
private List<String> mPkgRequestedMBSConnect;
/* List of media players which supports browse */
@@ -476,7 +474,6 @@
mLastDirection = 0;
mLocalVolume = -1;
mLastLocalVolume = -1;
- mAbsVolThreshold = 0;
mCurrAddrPlayerID = NO_PLAYER_ID;
mCurrBrowsePlayerID = 0;
mContext = context;
@@ -506,18 +503,6 @@
mAudioStreamMax = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
mVolumeStep = Math.max(AVRCP_BASE_VOLUME_STEP, AVRCP_MAX_VOL/mAudioStreamMax);
- Resources resources = context.getResources();
- if (resources != null) {
- mAbsVolThreshold = resources.getInteger(R.integer.a2dp_absolute_volume_initial_threshold);
-
- // Update the threshold if the threshold_percent is valid
- int threshold_percent =
- resources.getInteger(R.integer.a2dp_absolute_volume_initial_threshold_percent);
- if (threshold_percent >= 0 && threshold_percent <= 100) {
- mAbsVolThreshold = (threshold_percent * mAudioStreamMax) / 100;
- }
- }
-
// Register for package removal intent broadcasts for media button receiver persistence
IntentFilter pkgFilter = new IntentFilter();
pkgFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
@@ -570,7 +555,6 @@
mAvrcpPlayerAppSettingsRsp = new AvrcpPlayerAppSettingsRsp();
mMediaPlayerInfoList = new TreeMap<Integer, MediaPlayerInfo_ext>();
mAvailablePlayerViewChanged = false;
- mPlayerSwitching = false;
mPkgRequestedMBSConnect = new ArrayList<String>();
mBrowsePlayerInfoList = Collections.synchronizedList(new ArrayList<BrowsePlayerInfo_ext>());
mPassthroughDispatched = 0;
@@ -878,15 +862,9 @@
deviceIndex = msg.arg1;
int vol = msg.arg2;
BluetoothDevice device = mA2dpService.getActiveDevice();
- if(device == null)
+ if (device == null)
break;
- if (mAbsVolThreshold > 0 && mAbsVolThreshold < mAudioStreamMax &&
- vol > mAbsVolThreshold) {
- if (DEBUG) Log.v(TAG, "remote inital volume too high " + vol + ">" +
- mAbsVolThreshold);
- vol = mAbsVolThreshold;
- notifyVolumeChanged(vol, false);
- }
+
if (vol >= 0) {
int volume = convertToAvrcpVolume(vol);
int remVol = deviceFeatures[deviceIndex].mRemoteVolume;
@@ -5289,12 +5267,6 @@
return;
}
- if (mAbsVolThreshold > 0 && mAbsVolThreshold < mAudioStreamMax &&
- storeVolume > mAbsVolThreshold) {
- if (DEBUG) Log.v(TAG, "remote store volume too high" + storeVolume + ">" +
- mAbsVolThreshold);
- storeVolume = mAbsVolThreshold;
- }
if (index == INVALID_DEVICE_INDEX && disconnectedActiveDevice != null &&
(disconnectedActiveDevice.equals(device)
|| isTwsPlusPair(disconnectedActiveDevice, device))) {