diff options
Diffstat (limited to 'src/com/android/settings/development/bluetooth')
3 files changed, 8 insertions, 11 deletions
diff --git a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java index 6f1eab04b5..71907b6f9f 100644 --- a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java +++ b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java @@ -80,7 +80,7 @@ public abstract class AbstractBluetoothDialogPreferenceController extends } writeConfigurationValues(index); final BluetoothCodecConfig codecConfig = mBluetoothA2dpConfigStore.createCodecConfig(); - bluetoothA2dp.setCodecConfigPreference(bluetoothA2dp.getActiveDevice(), codecConfig); + bluetoothA2dp.setCodecConfigPreference(null, codecConfig); mPreference.setSummary(((BaseBluetoothDialogPreference) mPreference).generateSummary( index)); } @@ -146,8 +146,7 @@ public abstract class AbstractBluetoothDialogPreferenceController extends if (bluetoothA2dp == null) { return null; } - final BluetoothCodecStatus codecStatus = - bluetoothA2dp.getCodecStatus(bluetoothA2dp.getActiveDevice()); + final BluetoothCodecStatus codecStatus = bluetoothA2dp.getCodecStatus(null); if (codecStatus == null) { Log.d(TAG, "Unable to get current codec config. Codec status is null"); return null; @@ -178,8 +177,7 @@ public abstract class AbstractBluetoothDialogPreferenceController extends * @return {@link BluetoothCodecConfig}. */ protected BluetoothCodecConfig getSelectableByCodecType(int codecTypeValue) { - final BluetoothCodecConfig[] configs = getSelectableConfigs( - mBluetoothA2dp.getActiveDevice()); + final BluetoothCodecConfig[] configs = getSelectableConfigs(null); if (configs == null) { Log.d(TAG, "Unable to get selectable config. Selectable configs is empty."); return null; diff --git a/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java b/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java index 8eecec939a..c2977a8681 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.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: diff --git a/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java b/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java index 714b9ab314..80081886e3 100644 --- a/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java +++ b/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java @@ -58,11 +58,11 @@ public class BluetoothHDAudioPreferenceController extends AbstractBluetoothPrefe mPreference.setEnabled(false); return; } - final boolean supported = (bluetoothA2dp.isOptionalCodecsSupported(activeDevice) + final boolean supported = (bluetoothA2dp.supportsOptionalCodecs(activeDevice) == BluetoothA2dp.OPTIONAL_CODECS_SUPPORTED); mPreference.setEnabled(supported); if (supported) { - final boolean isEnabled = bluetoothA2dp.isOptionalCodecsEnabled(activeDevice) + final boolean isEnabled = bluetoothA2dp.getOptionalCodecsEnabled(activeDevice) == BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED; ((SwitchPreference) mPreference).setChecked(isEnabled); } |