From 48668576e44e4e557547df4c1fec4c29e070b18f Mon Sep 17 00:00:00 2001 From: Chienyuan Date: Wed, 23 May 2018 19:29:58 +0800 Subject: [PATCH] Set default value of A2DP HW offload toggle When developer options is disabled, A2DP HW offload toggle will switch to default value, we should decide default value according to A2DP HW offload is supported of not. Bug: 63932139 Bug: 79568680 Test: robotests Change-Id: I3bf941edd3c0e0f70cfba32dc856e3f14fee07fa --- .../BluetoothA2dpHwOffloadPreferenceController.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java index 553a63e5954..01ec156e754 100644 --- a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java +++ b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java @@ -69,8 +69,15 @@ public class BluetoothA2dpHwOffloadPreferenceController extends DeveloperOptions @Override protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); - ((SwitchPreference) mPreference).setChecked(true); - SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, "true"); + final boolean offloadSupported = + SystemProperties.getBoolean(A2DP_OFFLOAD_SUPPORTED_PROPERTY, false); + if (offloadSupported) { + ((SwitchPreference) mPreference).setChecked(false); + SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, "false"); + } else { + ((SwitchPreference) mPreference).setChecked(true); + SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, "true"); + } } public void onA2dpHwDialogConfirmed() {