summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetri Gynther <pgynther@google.com>2018-05-24 23:46:01 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-05-24 23:46:01 -0700
commit6a2ed0aed5da1aa738968761330bff2c4b29db07 (patch)
treeaffc790afbefcaa03a9a0b1dcda77057253f0c2f
parent8653748a18d635410f546cb419764306d75f7f2e (diff)
parent6cc221169bce3d79b36fc1a2a694247695824697 (diff)
downloadpackages_apps_Settings-6a2ed0aed5da1aa738968761330bff2c4b29db07.tar.gz
packages_apps_Settings-6a2ed0aed5da1aa738968761330bff2c4b29db07.tar.bz2
packages_apps_Settings-6a2ed0aed5da1aa738968761330bff2c4b29db07.zip
Merge "Set default value of A2DP HW offload toggle" into pi-dev am: d6acb081af
am: 6cc221169b Change-Id: Ia6097eeec41c0d19b06ce01db136e208a4cb6ebb
-rw-r--r--src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java
index a224eff6b7..6ba0a80417 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() {