diff options
| author | Lalit Kansara <lkansara@codeaurora.org> | 2016-12-06 14:47:45 +0530 |
|---|---|---|
| committer | Lalit Kansara <lkansara@codeaurora.org> | 2016-12-06 14:47:45 +0530 |
| commit | aa2a937e6c8c9c93cc1a5fe344c368b4276243c1 (patch) | |
| tree | 05648e985b986d372f3a3d7f60cab8d6b77e244d /res/values | |
| parent | c7ae94e96c0c7bb93ec80d548c024a968c411d32 (diff) | |
| parent | 1c40f9218d815e4e67482fb8913fce6850e4fb1c (diff) | |
| download | android_packages_apps_Bluetooth-aa2a937e6c8c9c93cc1a5fe344c368b4276243c1.tar.gz android_packages_apps_Bluetooth-aa2a937e6c8c9c93cc1a5fe344c368b4276243c1.tar.bz2 android_packages_apps_Bluetooth-aa2a937e6c8c9c93cc1a5fe344c368b4276243c1.zip | |
Merge commit '1c40f9218d815e4e67482fb8913fce6850e4fb1c' into remote
Conflicts:
jni/com_android_bluetooth_hfp.cpp
src/com/android/bluetooth/avrcp/Avrcp.java
src/com/android/bluetooth/btservice/AdapterService.java
src/com/android/bluetooth/btservice/RemoteDevices.java
src/com/android/bluetooth/hfp/HeadsetStateMachine.java
src/com/android/bluetooth/map/BluetoothMapContentObserver.java
src/com/android/bluetooth/map/BluetoothMapService.java
src/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java
src/com/android/bluetooth/pan/PanService.java
src/com/android/bluetooth/pbap/BluetoothPbapReceiver.java
Change-Id: I41068ac7787983519220fe6fee1e65ff66298db1
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/config.xml | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index dcbe20837..90e513d36 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -35,14 +35,25 @@ of the location permissions. --> <bool name="strict_location_check">true</bool> - <!-- Specifies the min/max connection interval parameters for high priority - and low power GATT configurations. These values are in multiples of - 1.25ms. --> + <!-- Specifies the min/max connection interval parameters for high priority, + balanced and low power GATT configurations. These values are in + multiples of 1.25ms. --> <integer name="gatt_high_priority_min_interval">9</integer> <integer name="gatt_high_priority_max_interval">12</integer> + <!-- Default specs recommended interval is 30 (24 * 1.25) -> 50 (40 * 1.25) + ms. --> + <integer name="gatt_balanced_priority_min_interval">24</integer> + <integer name="gatt_balanced_priority_max_interval">40</integer> <integer name="gatt_low_power_min_interval">80</integer> <integer name="gatt_low_power_max_interval">100</integer> + <!-- Specifies latency parameters for high priority, balanced and low power + GATT configurations. These values represents the number of packets a + slave device is allowed to skip. --> + <integer name="gatt_high_priority_latency">0</integer> + <integer name="gatt_balanced_priority_latency">0</integer> + <integer name="gatt_low_power_latency">2</integer> + <bool name="headset_client_initial_audio_route_allowed">true</bool> <!-- For AVRCP absolute volume feature. If the threshold is non-zero, |