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

Merge "Bluetooth: Enable AVDTP Delay reports by default."

Browse Source
This commit is contained in:
Treehugger Robot
2018-03-09 20:56:50 +00:00
committed by Gerrit Code Review
parent 4ec0e8e865 e5ed810753
commit f8ad32823c
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@@ -1608,10 +1608,10 @@
<!-- Summary of checkbox for disabling Bluetooth inband ringing in Development Settings --> <!-- Summary of checkbox for disabling Bluetooth inband ringing in Development Settings -->
<string name="bluetooth_disable_inband_ringing_summary">Don’t play custom phone ringtones on Bluetooth headsets</string> <string name="bluetooth_disable_inband_ringing_summary">Don’t play custom phone ringtones on Bluetooth headsets</string>
<!-- Setting title for enabling Bluetooth delay reporting in Development Settings --> <!-- Setting title for disabling Bluetooth delay reporting in Development Settings -->
<string name="bluetooth_enable_avdtp_delay_reports">Enable Bluetooth Audio Delay Report handling</string> <string name="bluetooth_disable_avdtp_delay_reports">Disable Bluetooth Audio Delay Report handling</string>
<!-- Summary of checkbox for enabling Bluetooth delay reporting in Development Settings --> <!-- Summary of checkbox for disabling Bluetooth delay reporting in Development Settings -->
<string name="bluetooth_enable_avdtp_delay_reports_summary">Handle Audio Delay Reports recieved from remote devices</string> <string name="bluetooth_disable_avdtp_delay_reports_summary">Stop Handling Audio Delay Reports received from remote devices</string>
<!-- Bluetooth developer settings: Maximum number of connected audio devices --> <!-- Bluetooth developer settings: Maximum number of connected audio devices -->
<string name="bluetooth_max_connected_audio_devices_string">Maximum number of connected Bluetooth audio devices</string> <string name="bluetooth_max_connected_audio_devices_string">Maximum number of connected Bluetooth audio devices</string>

6
res/xml/development_prefs.xml
View File

@@ -229,9 +229,9 @@
android:summary="@string/bluetooth_disable_inband_ringing_summary"/> android:summary="@string/bluetooth_disable_inband_ringing_summary"/>
<SwitchPreference <SwitchPreference
android:key="bluetooth_enable_avdtp_delay_reports" android:key="bluetooth_disable_avdtp_delay_reports"
android:title="@string/bluetooth_enable_avdtp_delay_reports" android:title="@string/bluetooth_disable_avdtp_delay_reports"
android:summary="@string/bluetooth_enable_avdtp_delay_reports_summary"/> android:summary="@string/bluetooth_disable_avdtp_delay_reports_summary"/>
<ListPreference <ListPreference
android:key="bluetooth_select_avrcp_version" android:key="bluetooth_select_avrcp_version"

28
src/com/android/settings/development/DevelopmentSettings.java
View File

@@ -214,14 +214,14 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
"persist.bluetooth.disableinbandringing"; "persist.bluetooth.disableinbandringing";
private static final String BLUETOOTH_BTSNOOP_ENABLE_PROPERTY = private static final String BLUETOOTH_BTSNOOP_ENABLE_PROPERTY =
"persist.bluetooth.btsnoopenable"; "persist.bluetooth.btsnoopenable";
private static final String BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY = private static final String BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY =
"persist.bluetooth.enabledelayreports"; "persist.bluetooth.disabledelayreports";
static final String BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES_PROPERTY = static final String BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES_PROPERTY =
"persist.bluetooth.maxconnectedaudiodevices"; "persist.bluetooth.maxconnectedaudiodevices";
private static final String BLUETOOTH_DISABLE_INBAND_RINGING_KEY = "bluetooth_disable_inband_ringing"; private static final String BLUETOOTH_DISABLE_INBAND_RINGING_KEY = "bluetooth_disable_inband_ringing";
private static final String BLUETOOTH_ENABLE_AVDTP_DELAY_REPORT_KEY = "bluetooth_enable_avdtp_delay_reports"; private static final String BLUETOOTH_DISABLE_AVDTP_DELAY_REPORT_KEY = "bluetooth_disable_avdtp_delay_reports";
private static final String BLUETOOTH_SELECT_AVRCP_VERSION_KEY = "bluetooth_select_avrcp_version"; private static final String BLUETOOTH_SELECT_AVRCP_VERSION_KEY = "bluetooth_select_avrcp_version";
private static final String BLUETOOTH_SELECT_A2DP_CODEC_KEY = "bluetooth_select_a2dp_codec"; private static final String BLUETOOTH_SELECT_A2DP_CODEC_KEY = "bluetooth_select_a2dp_codec";
private static final String BLUETOOTH_SELECT_A2DP_SAMPLE_RATE_KEY = "bluetooth_select_a2dp_sample_rate"; private static final String BLUETOOTH_SELECT_A2DP_SAMPLE_RATE_KEY = "bluetooth_select_a2dp_sample_rate";
@@ -300,7 +300,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private SwitchPreference mBluetoothShowDevicesWithoutNames; private SwitchPreference mBluetoothShowDevicesWithoutNames;
private SwitchPreference mBluetoothDisableAbsVolume; private SwitchPreference mBluetoothDisableAbsVolume;
private SwitchPreference mBluetoothDisableInbandRinging; private SwitchPreference mBluetoothDisableInbandRinging;
private SwitchPreference mBluetoothEnableAvdtpDelayReport; private SwitchPreference mBluetoothDisableAvdtpDelayReport;
private BluetoothA2dp mBluetoothA2dp; private BluetoothA2dp mBluetoothA2dp;
private final Object mBluetoothA2dpLock = new Object(); private final Object mBluetoothA2dpLock = new Object();
@@ -530,7 +530,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
removePreference(mBluetoothDisableInbandRinging); removePreference(mBluetoothDisableInbandRinging);
mBluetoothDisableInbandRinging = null; mBluetoothDisableInbandRinging = null;
} }
mBluetoothEnableAvdtpDelayReport = findAndInitSwitchPref(BLUETOOTH_ENABLE_AVDTP_DELAY_REPORT_KEY); mBluetoothDisableAvdtpDelayReport = findAndInitSwitchPref(BLUETOOTH_DISABLE_AVDTP_DELAY_REPORT_KEY);
mBluetoothSelectAvrcpVersion = addListPreference(BLUETOOTH_SELECT_AVRCP_VERSION_KEY); mBluetoothSelectAvrcpVersion = addListPreference(BLUETOOTH_SELECT_AVRCP_VERSION_KEY);
mBluetoothSelectA2dpCodec = addListPreference(BLUETOOTH_SELECT_A2DP_CODEC_KEY); mBluetoothSelectA2dpCodec = addListPreference(BLUETOOTH_SELECT_A2DP_CODEC_KEY);
@@ -873,7 +873,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
updateBluetoothShowDevicesWithoutUserFriendlyNameOptions(); updateBluetoothShowDevicesWithoutUserFriendlyNameOptions();
updateBluetoothDisableAbsVolumeOptions(); updateBluetoothDisableAbsVolumeOptions();
updateBluetoothDisableInbandRingingOptions(); updateBluetoothDisableInbandRingingOptions();
updateBluetoothEnableAvdtpDelayReportOptions(); updateBluetoothDisableAvdtpDelayReportOptions();
updateBluetoothA2dpConfigurationValues(); updateBluetoothA2dpConfigurationValues();
updatePrivateDnsSummary(); updatePrivateDnsSummary();
} }
@@ -1549,14 +1549,14 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
} }
} }
private void updateBluetoothEnableAvdtpDelayReportOptions() { private void updateBluetoothDisableAvdtpDelayReportOptions() {
updateSwitchPreference(mBluetoothEnableAvdtpDelayReport, updateSwitchPreference(mBluetoothDisableAvdtpDelayReport,
SystemProperties.getBoolean(BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY, false)); SystemProperties.getBoolean(BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY, false));
} }
private void writeBluetoothEnableAvdtpDelayReportOptions() { private void writeBluetoothDisableAvdtpDelayReportOptions() {
SystemProperties.set(BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY, SystemProperties.set(BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY,
mBluetoothEnableAvdtpDelayReport.isChecked() ? "true" : "false"); mBluetoothDisableAvdtpDelayReport.isChecked() ? "true" : "false");
} }
private void updateMobileDataAlwaysOnOptions() { private void updateMobileDataAlwaysOnOptions() {
@@ -2656,8 +2656,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
writeBluetoothDisableAbsVolumeOptions(); writeBluetoothDisableAbsVolumeOptions();
} else if (preference == mBluetoothDisableInbandRinging) { } else if (preference == mBluetoothDisableInbandRinging) {
writeBluetoothDisableInbandRingingOptions(); writeBluetoothDisableInbandRingingOptions();
} else if (preference == mBluetoothEnableAvdtpDelayReport) { } else if (preference == mBluetoothDisableAvdtpDelayReport) {
writeBluetoothEnableAvdtpDelayReportOptions(); writeBluetoothDisableAvdtpDelayReportOptions();
} else if (SHORTCUT_MANAGER_RESET_KEY.equals(preference.getKey())) { } else if (SHORTCUT_MANAGER_RESET_KEY.equals(preference.getKey())) {
resetShortcutManagerThrottling(); resetShortcutManagerThrottling();
} else { } else {