Merge "Add developer menu entry to enable Bluetooth AVDTP delay reports"
This commit is contained in:
@@ -1606,6 +1606,11 @@
|
||||
<!-- 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>
|
||||
|
||||
<!-- 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>
|
||||
<!-- Bluetooth developer settings: Maximum number of connected audio devices -->
|
||||
|
@@ -228,6 +228,11 @@
|
||||
android:title="@string/bluetooth_disable_inband_ringing"
|
||||
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"/>
|
||||
|
||||
<ListPreference
|
||||
android:key="bluetooth_select_avrcp_version"
|
||||
android:title="@string/bluetooth_select_avrcp_version_string"
|
||||
|
@@ -214,11 +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";
|
||||
|
||||
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_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";
|
||||
@@ -297,6 +300,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
|
||||
private SwitchPreference mBluetoothShowDevicesWithoutNames;
|
||||
private SwitchPreference mBluetoothDisableAbsVolume;
|
||||
private SwitchPreference mBluetoothDisableInbandRinging;
|
||||
private SwitchPreference mBluetoothEnableAvdtpDelayReport;
|
||||
|
||||
private BluetoothA2dp mBluetoothA2dp;
|
||||
private final Object mBluetoothA2dpLock = new Object();
|
||||
@@ -526,6 +530,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
|
||||
removePreference(mBluetoothDisableInbandRinging);
|
||||
mBluetoothDisableInbandRinging = null;
|
||||
}
|
||||
mBluetoothEnableAvdtpDelayReport = findAndInitSwitchPref(BLUETOOTH_ENABLE_AVDTP_DELAY_REPORT_KEY);
|
||||
|
||||
mBluetoothSelectAvrcpVersion = addListPreference(BLUETOOTH_SELECT_AVRCP_VERSION_KEY);
|
||||
mBluetoothSelectA2dpCodec = addListPreference(BLUETOOTH_SELECT_A2DP_CODEC_KEY);
|
||||
@@ -868,6 +873,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
|
||||
updateBluetoothShowDevicesWithoutUserFriendlyNameOptions();
|
||||
updateBluetoothDisableAbsVolumeOptions();
|
||||
updateBluetoothDisableInbandRingingOptions();
|
||||
updateBluetoothEnableAvdtpDelayReportOptions();
|
||||
updateBluetoothA2dpConfigurationValues();
|
||||
updatePrivateDnsSummary();
|
||||
}
|
||||
@@ -1542,6 +1548,16 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
|
||||
}
|
||||
}
|
||||
|
||||
private void updateBluetoothEnableAvdtpDelayReportOptions() {
|
||||
updateSwitchPreference(mBluetoothEnableAvdtpDelayReport,
|
||||
SystemProperties.getBoolean(BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY, false));
|
||||
}
|
||||
|
||||
private void writeBluetoothEnableAvdtpDelayReportOptions() {
|
||||
SystemProperties.set(BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY,
|
||||
mBluetoothEnableAvdtpDelayReport.isChecked() ? "true" : "false");
|
||||
}
|
||||
|
||||
private void updateMobileDataAlwaysOnOptions() {
|
||||
updateSwitchPreference(mMobileDataAlwaysOn, Settings.Global.getInt(
|
||||
getActivity().getContentResolver(),
|
||||
@@ -2616,6 +2632,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
|
||||
writeBluetoothDisableAbsVolumeOptions();
|
||||
} else if (preference == mBluetoothDisableInbandRinging) {
|
||||
writeBluetoothDisableInbandRingingOptions();
|
||||
} else if (preference == mBluetoothEnableAvdtpDelayReport) {
|
||||
writeBluetoothEnableAvdtpDelayReportOptions();
|
||||
} else if (SHORTCUT_MANAGER_RESET_KEY.equals(preference.getKey())) {
|
||||
resetShortcutManagerThrottling();
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user