PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Pass in active device to all BluetoothA2dp APIs in packa..."

Browse Source 
Revert submission 10253996-bt-a2dp-no-null

Reason for revert: b/149361880
Reverted Changes:
If43934374: Pass in active device to all BluetoothA2dp APIs in...
I22dd1ca36: Make sure calls to BluetoothA2dp APIs pass non-nul...
If6475af6f: Require user pass in a non-null BluetoothDevice to...
I9d0e2c89c: Pass in active device to all BluetoothA2dp APIs in...
I1faa6174d: Need to now pass in active device instead of null ...
I69a941a7e: Pass in active device to all BluetoothA2dp APIs in...

Change-Id: I1d8660b11c917cf657e61478d58794182e17ec1a
This commit is contained in:
Daniel Chapin
2020-02-12 17:16:10 +00:00
parent dcedd7d6f5
commit 2be6fc2afe
11 changed files with 36 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java
View File

@@ -83,9 +83,9 @@ public class BluetoothCodecDialogPreferenceController extends
return index;
}
// Check HD audio is enabled, display the available list.
if (bluetoothA2dp.isOptionalCodecsEnabled(activeDevice)
if (bluetoothA2dp.getOptionalCodecsEnabled(activeDevice)
== BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED) {
BluetoothCodecConfig[] configs = getSelectableConfigs(bluetoothA2dp.getActiveDevice());
BluetoothCodecConfig[] configs = getSelectableConfigs(null);
if (configs != null) {
return getIndexFromConfig(configs);
}
@@ -101,8 +101,7 @@ public class BluetoothCodecDialogPreferenceController extends
int codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;
switch (index) {
case 0:
codecTypeValue = getHighestCodec(getSelectableConfigs(
mBluetoothA2dp.getActiveDevice()));
codecTypeValue = getHighestCodec(getSelectableConfigs(null));
codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
break;
case 1: