configure avdtp signalling timeout to default value (4 secs)

also added mutex protection for any a2dp control path signalling to
ensure only one outstanding request at a time

Change-Id: I06d95793a8632f6a8baec967a1d8440ecce8a65d

Conflicts:

	audio_a2dp_hw/audio_a2dp_hw.c

14 files changed, 4 insertions, 4 deletions

diff --git a/btif/include/btif_av.h b/btif/include/btif_av.h
index 2c08a99..2c08a99 100755..100644
--- a/btif/include/btif_av.h
+++ b/btif/include/btif_av.h
diff --git a/btif/include/btif_hl.h b/btif/include/btif_hl.h
index cac6eb2..cac6eb2 100755..100644
--- a/btif/include/btif_hl.h
+++ b/btif/include/btif_hl.h
diff --git a/btif/include/btif_profile_queue.h b/btif/include/btif_profile_queue.h
index 8f5f013..8f5f013 100755..100644
--- a/btif/include/btif_profile_queue.h
+++ b/btif/include/btif_profile_queue.h
diff --git a/btif/include/btif_storage.h b/btif/include/btif_storage.h
index f4b2ca3..f4b2ca3 100755..100644
--- a/btif/include/btif_storage.h
+++ b/btif/include/btif_storage.h
diff --git a/btif/src/btif_av.c b/btif/src/btif_av.c
index 80bee96..80bee96 100755..100644
--- a/btif/src/btif_av.c
+++ b/btif/src/btif_av.c
diff --git a/btif/src/btif_core.c b/btif/src/btif_core.c
index 0b0734e..0b0734e 100755..100644
--- a/btif/src/btif_core.c
+++ b/btif/src/btif_core.c
diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c
index 265a834..265a834 100755..100644
--- a/btif/src/btif_dm.c
+++ b/btif/src/btif_dm.c
diff --git a/btif/src/btif_hf.c b/btif/src/btif_hf.c
index 0c0ed59..0c0ed59 100755..100644
--- a/btif/src/btif_hf.c
+++ b/btif/src/btif_hf.c
diff --git a/btif/src/btif_hh.c b/btif/src/btif_hh.c
index c6fd378..c6fd378 100755..100644
--- a/btif/src/btif_hh.c
+++ b/btif/src/btif_hh.c
diff --git a/btif/src/btif_hl.c b/btif/src/btif_hl.c
index 5c3ed84..5c3ed84 100755..100644
--- a/btif/src/btif_hl.c
+++ b/btif/src/btif_hl.c
diff --git a/btif/src/btif_media_task.c b/btif/src/btif_media_task.c
index 9de74d5..9de74d5 100755..100644
--- a/btif/src/btif_media_task.c
+++ b/btif/src/btif_media_task.c
diff --git a/btif/src/btif_profile_queue.c b/btif/src/btif_profile_queue.c
index 4081c6a..4081c6a 100755..100644
--- a/btif/src/btif_profile_queue.c
+++ b/btif/src/btif_profile_queue.c
diff --git a/btif/src/btif_rc.c b/btif/src/btif_rc.c
index 248696a..248696a 100755..100644
--- a/btif/src/btif_rc.c
+++ b/btif/src/btif_rc.c
diff --git a/btif/src/btif_storage.c b/btif/src/btif_storage.c
index bb18b85..bc7b771 100755..100644
--- a/btif/src/btif_storage.c
+++ b/btif/src/btif_storage.c
@@ -145,7 +145,7 @@
 #define BTIF_STORAGE_KEY_AUTOPAIR_FIXPIN_KBLIST "FixedPinZerosKeyboardBlacklist"
 #define BTIF_STORAGE_KEY_AUTOPAIR_DYNAMIC_BLACKLIST_ADDR "DynamicAddressBlacklist"
 
-#define BTIF_AUTO_PAIR_CONF_VALUE_SEPERATOR ","
+#define BTIF_AUTO_PAIR_CONF_VALUE_SEPARATOR ","
 #define BTIF_AUTO_PAIR_CONF_SPACE ' '
 #define BTIF_AUTO_PAIR_CONF_COMMENT '#'
 #define BTIF_AUTO_PAIR_CONF_KEY_VAL_DELIMETER "="
@@ -1851,13 +1851,13 @@ BOOLEAN  btif_storage_is_device_autopair_blacklisted(bt_bdaddr_t *remote_dev_add
                               linebuf, BTIF_STORAGE_MAX_LINE_SZ);
         if (value != NULL)
         {
-            token = strtok(value, BTIF_AUTO_PAIR_CONF_VALUE_SEPERATOR);
+            token = strtok(value, BTIF_AUTO_PAIR_CONF_VALUE_SEPARATOR);
             while (token != NULL)
             {
                 if (strstr(dev_name_str, token) != NULL)
                     return TRUE;
 
-                token = strtok(NULL, BTIF_AUTO_PAIR_CONF_VALUE_SEPERATOR);
+                token = strtok(NULL, BTIF_AUTO_PAIR_CONF_VALUE_SEPARATOR);
             }
         }
     }
@@ -1894,7 +1894,7 @@ bt_status_t btif_storage_add_device_to_autopair_blacklist(bt_bdaddr_t *remote_de
 
     bd2str(remote_dev_addr, &bdstr);
     strncpy(input_value, (char*)bdstr, 20);
-    strncat (input_value,BTIF_AUTO_PAIR_CONF_VALUE_SEPERATOR, 20);
+    strncat (input_value,BTIF_AUTO_PAIR_CONF_VALUE_SEPARATOR, 20);
 
     /* create filepath */
     fname = btif_in_make_filename(NULL, BTIF_STORAGE_PATH_AUTOPAIR_BLACKLIST);