diff options
| author | Rahul Sabnis <rahulsabnis@google.com> | 2020-02-03 18:22:54 -0800 |
|---|---|---|
| committer | Rahul Sabnis <rahulsabnis@google.com> | 2020-02-10 11:16:49 -0800 |
| commit | dcedd7d6f58bcb267d92dd35fec6a094086eab97 (patch) | |
| tree | e8c524e2faad1145402873a11b4d19f96772bc1e /src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java | |
| parent | 3c77bd3631cb2cef3e8b294d8625cb83bf8c0919 (diff) | |
| download | packages_apps_Settings-dcedd7d6f58bcb267d92dd35fec6a094086eab97.tar.gz packages_apps_Settings-dcedd7d6f58bcb267d92dd35fec6a094086eab97.tar.bz2 packages_apps_Settings-dcedd7d6f58bcb267d92dd35fec6a094086eab97.zip | |
Pass in active device to all BluetoothA2dp APIs in
packages/apps/Settings as null input is no longer supported
Bug: 147287141
Test: Manual
Change-Id: If43934374914c657080ffd0509f8095d988cc550
Diffstat (limited to 'src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java b/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java index c2977a8681..8eecec939a 100644 --- a/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java +++ b/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java @@ -83,9 +83,9 @@ public class BluetoothCodecDialogPreferenceController extends return index; } // Check HD audio is enabled, display the available list. - if (bluetoothA2dp.getOptionalCodecsEnabled(activeDevice) + if (bluetoothA2dp.isOptionalCodecsEnabled(activeDevice) == BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED) { - BluetoothCodecConfig[] configs = getSelectableConfigs(null); + BluetoothCodecConfig[] configs = getSelectableConfigs(bluetoothA2dp.getActiveDevice()); if (configs != null) { return getIndexFromConfig(configs); } @@ -101,7 +101,8 @@ public class BluetoothCodecDialogPreferenceController extends int codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT; switch (index) { case 0: - codecTypeValue = getHighestCodec(getSelectableConfigs(null)); + codecTypeValue = getHighestCodec(getSelectableConfigs( + mBluetoothA2dp.getActiveDevice())); codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST; break; case 1: |