22 files changed, 12 insertions, 11 deletions
diff --git a/audio_a2dp_hw/audio_a2dp_hw.c b/audio_a2dp_hw/audio_a2dp_hw.c
index d65f3af..6bfec3c 100755..100644
--- a/audio_a2dp_hw/audio_a2dp_hw.c
+++ b/audio_a2dp_hw/audio_a2dp_hw.c
@@ -436,6 +436,7 @@ static int suspend_audio_datapath(struct a2dp_stream_out *out, bool standby)
 
     /* disconnect audio path */
     skt_disconnect(out->audio_fd);
+
     out->audio_fd = AUDIO_SKT_DISCONNECTED;
 
     return 0;
@@ -478,6 +479,8 @@ static ssize_t out_write(struct audio_stream_out *stream, const void* buffer,
     if ((out->state == AUDIO_A2DP_STATE_STOPPED) ||
         (out->state == AUDIO_A2DP_STATE_STANDBY))
     {
+        pthread_mutex_lock(&out->lock);
+
         if (start_audio_datapath(out) < 0)
         {
             /* emulate time this write represents to avoid very fast write
@@ -488,8 +491,11 @@ static ssize_t out_write(struct audio_stream_out *stream, const void* buffer,
             DEBUG("emulate a2dp write delay (%d us)", us_delay);
 
             usleep(us_delay);
+            pthread_mutex_unlock(&out->lock);
             return -1;
         }
+
+        pthread_mutex_unlock(&out->lock);
     }
     else if (out->state != AUDIO_A2DP_STATE_STARTED)
     {
@@ -572,6 +578,7 @@ static int out_set_format(struct audio_stream *stream, audio_format_t format)
 static int out_standby(struct audio_stream *stream)
 {
     struct a2dp_stream_out *out = (struct a2dp_stream_out *)stream;
+    int retval = 0;
 
     int retVal = 0;
 
@@ -915,9 +922,7 @@ static int adev_set_parameters(struct audio_hw_device *dev, const char *kvpairs)
 
     DEBUG("state %d", out->state);
 
-    pthread_mutex_lock(&out->lock);
     retval = out->stream.common.set_parameters((struct audio_stream *)out, kvpairs);
-    pthread_mutex_unlock(&out->lock);
 
     return retval;
 }
@@ -1124,3 +1129,4 @@ struct audio_module HAL_MODULE_INFO_SYM = {
         .methods = &hal_module_methods,
     },
 };
+
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);
diff --git a/include/bdroid_crespo.txt b/include/bdroid_crespo.txt
index 2c58193..e47625d 100755
--- a/include/bdroid_crespo.txt
+++ b/include/bdroid_crespo.txt
@@ -140,7 +140,6 @@ BTM_MAX_SCO_LINKS = 2
 BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
 BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE)
 BTA_AV_MAX_A2DP_MTU = 668
-BTA_AV_RET_TOUT = 15
 PORCHE_PAIRING_CONFLICT = TRUE
 BTA_AV_CO_CP_SCMS_T = FALSE
 AVDT_CONNECT_CP_ONLY = FALSE
diff --git a/include/bdroid_crespo4g.txt b/include/bdroid_crespo4g.txt
index 2c58193..e47625d 100755
--- a/include/bdroid_crespo4g.txt
+++ b/include/bdroid_crespo4g.txt
@@ -140,7 +140,6 @@ BTM_MAX_SCO_LINKS = 2
 BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
 BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE)
 BTA_AV_MAX_A2DP_MTU = 668
-BTA_AV_RET_TOUT = 15
 PORCHE_PAIRING_CONFLICT = TRUE
 BTA_AV_CO_CP_SCMS_T = FALSE
 AVDT_CONNECT_CP_ONLY = FALSE
diff --git a/include/bdroid_maguro.txt b/include/bdroid_maguro.txt
index 9fe40d7..d1c461a 100755
--- a/include/bdroid_maguro.txt
+++ b/include/bdroid_maguro.txt
@@ -140,7 +140,6 @@ BTM_MAX_SCO_LINKS = 2
 BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
 BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE)
 BTA_AV_MAX_A2DP_MTU = 668
-BTA_AV_RET_TOUT = 15
 PORCHE_PAIRING_CONFLICT = TRUE
 BTA_AV_CO_CP_SCMS_T = FALSE
 AVDT_CONNECT_CP_ONLY = FALSE
diff --git a/include/bdroid_toro.txt b/include/bdroid_toro.txt
index 3e5a4ea..4e563d0 100755
--- a/include/bdroid_toro.txt
+++ b/include/bdroid_toro.txt
@@ -140,7 +140,6 @@ BTM_MAX_SCO_LINKS = 2
 BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
 BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE)
 BTA_AV_MAX_A2DP_MTU = 668
-BTA_AV_RET_TOUT = 15
 PORCHE_PAIRING_CONFLICT = TRUE
 BTA_AV_CO_CP_SCMS_T = FALSE
 AVDT_CONNECT_CP_ONLY = FALSE
diff --git a/include/bdroid_wingray.txt b/include/bdroid_wingray.txt
index 3636ba7..3d93877 100755
--- a/include/bdroid_wingray.txt
+++ b/include/bdroid_wingray.txt
@@ -141,7 +141,6 @@ BTM_MAX_SCO_LINKS = 2
 BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
 BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE)
 BTA_AV_MAX_A2DP_MTU = 668
-BTA_AV_RET_TOUT = 15
 PORCHE_PAIRING_CONFLICT = TRUE
 BTA_AV_CO_CP_SCMS_T = FALSE
 AVDT_CONNECT_CP_ONLY = FALSE
diff --git a/udrv/include/unv.h b/udrv/include/unv.h
index ea1d817..ea1d817 100755..100644
--- a/udrv/include/unv.h
+++ b/udrv/include/unv.h
diff --git a/udrv/ulinux/unv_linux.c b/udrv/ulinux/unv_linux.c
index 773bbe6..773bbe6 100755..100644
--- a/udrv/ulinux/unv_linux.c
+++ b/udrv/ulinux/unv_linux.c