commit 0e94b62d60f3a729b03841a1891af3a889c9748f
author Sharvil Nanavati <sharvil@google.com> Mon Sep 14 18:00:25 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 14 18:00:25 2015 +0000
tree 411f8328cefbe04f14e3674f4fed454fd0912234
parent 93793893b122e5eb3101899411fccaabc075dfaf
parent a27628d5cb96981b65daec4db798d06ba9d98ce2

Merge "Send the AUDIO_CONNECTED broadcast after switching to the AudioOn state." into cw-e-dev

res/values/config.xml

diff --git a/res/values/config.xml b/res/values/config.xml
index 1684183..79fe9ce 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -33,4 +33,12 @@
          fire Bluetooth LE scan result callbacks in addition to having one
          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. -->
+    <integer name="gatt_high_priority_min_interval">9</integer>
+    <integer name="gatt_high_priority_max_interval">12</integer>
+    <integer name="gatt_low_power_min_interval">80</integer>
+    <integer name="gatt_low_power_max_interval">100</integer>
 </resources>

src/com/android/bluetooth/gatt/GattService.java

diff --git a/src/com/android/bluetooth/gatt/GattService.java b/src/com/android/bluetooth/gatt/GattService.java
index a04d5a3..a5fdfea 100644
--- a/src/com/android/bluetooth/gatt/GattService.java
+++ b/src/com/android/bluetooth/gatt/GattService.java
@@ -1673,13 +1673,13 @@
         switch (connectionPriority)
         {
             case BluetoothGatt.CONNECTION_PRIORITY_HIGH:
-                minInterval = 9; // 11.25ms
-                maxInterval = 12; // 15ms
+                minInterval = getResources().getInteger(R.integer.gatt_high_priority_min_interval);
+                maxInterval = getResources().getInteger(R.integer.gatt_high_priority_max_interval);
                 break;
 
             case BluetoothGatt.CONNECTION_PRIORITY_LOW_POWER:
-                minInterval = 80; // 100ms
-                maxInterval = 100; // 125ms
+                minInterval = getResources().getInteger(R.integer.gatt_low_power_min_interval);
+                maxInterval = getResources().getInteger(R.integer.gatt_low_power_max_interval);
                 latency = 2;
                 break;
         }

src/com/android/bluetooth/map/BluetoothMapContent.java

diff --git a/src/com/android/bluetooth/map/BluetoothMapContent.java b/src/com/android/bluetooth/map/BluetoothMapContent.java
index 28f5d42..7ced91b 100644
--- a/src/com/android/bluetooth/map/BluetoothMapContent.java
+++ b/src/com/android/bluetooth/map/BluetoothMapContent.java
@@ -117,7 +117,7 @@
     // MAP specification states that the default value for parameter mask are
     // the #REQUIRED attributes in the DTD, and not all enabled
     public static final long PARAMETER_MASK_ALL_ENABLED = 0xFFFFFFFFL;
-    public static final long PARAMETER_MASK_DEFAULT = 0x5E3L;
+    public static final long PARAMETER_MASK_DEFAULT = 0x5EBL;
     public static final long CONVO_PARAMETER_MASK_ALL_ENABLED = 0xFFFFFFFFL;
     public static final long CONVO_PARAMETER_MASK_DEFAULT =
             CONVO_PARAM_MASK_CONVO_NAME |