Merge "Bluetooth: Enable AVDTP Delay reports by default." (f8ad3282) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+4 −4

Original line number	Diff line number	Diff line
		@@ -1608,10 +1608,10 @@
		<!-- 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>

		<!-- Setting title for enabling Bluetooth delay reporting in Development Settings -->
		<string name="bluetooth_enable_avdtp_delay_reports">Enable Bluetooth Audio Delay Report handling</string>
		<!-- Summary of checkbox for enabling Bluetooth delay reporting in Development Settings -->
		<string name="bluetooth_enable_avdtp_delay_reports_summary">Handle Audio Delay Reports recieved from remote devices</string>
		<!-- Setting title for disabling Bluetooth delay reporting in Development Settings -->
		<string name="bluetooth_disable_avdtp_delay_reports">Disable Bluetooth Audio Delay Report handling</string>
		<!-- Summary of checkbox for disabling Bluetooth delay reporting in Development Settings -->
		<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 -->
		<string name="bluetooth_max_connected_audio_devices_string">Maximum number of connected Bluetooth audio devices</string>

res/xml/development_prefs.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -229,9 +229,9 @@
		android:summary="@string/bluetooth_disable_inband_ringing_summary"/>

		<SwitchPreference
		android:key="bluetooth_enable_avdtp_delay_reports"
		android:title="@string/bluetooth_enable_avdtp_delay_reports"
		android:summary="@string/bluetooth_enable_avdtp_delay_reports_summary"/>
		android:key="bluetooth_disable_avdtp_delay_reports"
		android:title="@string/bluetooth_disable_avdtp_delay_reports"
		android:summary="@string/bluetooth_disable_avdtp_delay_reports_summary"/>

		<ListPreference
		android:key="bluetooth_select_avrcp_version"

src/com/android/settings/development/DevelopmentSettings.java

+14 −14

Original line number	Diff line number	Diff line
		@@ -214,14 +214,14 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
		"persist.bluetooth.disableinbandringing";
		private static final String BLUETOOTH_BTSNOOP_ENABLE_PROPERTY =
		"persist.bluetooth.btsnoopenable";
		private static final String BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY =
		"persist.bluetooth.enabledelayreports";
		private static final String BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY =
		"persist.bluetooth.disabledelayreports";

		static final String BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES_PROPERTY =
		"persist.bluetooth.maxconnectedaudiodevices";

		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_A2DP_CODEC_KEY = "bluetooth_select_a2dp_codec";
		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 mBluetoothDisableAbsVolume;
		private SwitchPreference mBluetoothDisableInbandRinging;
		private SwitchPreference mBluetoothEnableAvdtpDelayReport;
		private SwitchPreference mBluetoothDisableAvdtpDelayReport;

		private BluetoothA2dp mBluetoothA2dp;
		private final Object mBluetoothA2dpLock = new Object();
		@@ -530,7 +530,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
		removePreference(mBluetoothDisableInbandRinging);
		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);
		mBluetoothSelectA2dpCodec = addListPreference(BLUETOOTH_SELECT_A2DP_CODEC_KEY);
		@@ -873,7 +873,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
		updateBluetoothShowDevicesWithoutUserFriendlyNameOptions();
		updateBluetoothDisableAbsVolumeOptions();
		updateBluetoothDisableInbandRingingOptions();
		updateBluetoothEnableAvdtpDelayReportOptions();
		updateBluetoothDisableAvdtpDelayReportOptions();
		updateBluetoothA2dpConfigurationValues();
		updatePrivateDnsSummary();
		}
		@@ -1549,14 +1549,14 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
		}
		}

		private void updateBluetoothEnableAvdtpDelayReportOptions() {
		updateSwitchPreference(mBluetoothEnableAvdtpDelayReport,
		SystemProperties.getBoolean(BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY, false));
		private void updateBluetoothDisableAvdtpDelayReportOptions() {
		updateSwitchPreference(mBluetoothDisableAvdtpDelayReport,
		SystemProperties.getBoolean(BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY, false));
		}

		private void writeBluetoothEnableAvdtpDelayReportOptions() {
		SystemProperties.set(BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY,
		mBluetoothEnableAvdtpDelayReport.isChecked() ? "true" : "false");
		private void writeBluetoothDisableAvdtpDelayReportOptions() {
		SystemProperties.set(BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY,
		mBluetoothDisableAvdtpDelayReport.isChecked() ? "true" : "false");
		}

		private void updateMobileDataAlwaysOnOptions() {
		@@ -2656,8 +2656,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
		writeBluetoothDisableAbsVolumeOptions();
		} else if (preference == mBluetoothDisableInbandRinging) {
		writeBluetoothDisableInbandRingingOptions();
		} else if (preference == mBluetoothEnableAvdtpDelayReport) {
		writeBluetoothEnableAvdtpDelayReportOptions();
		} else if (preference == mBluetoothDisableAvdtpDelayReport) {
		writeBluetoothDisableAvdtpDelayReportOptions();
		} else if (SHORTCUT_MANAGER_RESET_KEY.equals(preference.getKey())) {
		resetShortcutManagerThrottling();
		} else {