Commit: 8587f4f9a808dc15c1b949c10a5b049f83fda2f8 - system-bt (git)

system/bt

Commit MetaInfo

• Revision: 8587f4f9a808dc15c1b949c10a5b049f83fda2f8 (tree)
• Time: 2016-10-05 08:24:56
• Author: Steve Kondik <steve@cyng...>
• Commiter: Steve Kondik

Log Message

Android 7.0.0 Release 14 (NBD90Z)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlfz9GMACgkQ6K0/gZqxDniztACcCXYJhyKu/kYqT6b8cZ/1Ceau
AnEAnjcawrQlJbnI/BJC53f1MmlMmRu+
=jjbE
-----END PGP SIGNATURE-----

Merge tag 'android-7.0.0_r14' of https://android.googlesource.com/platform/system/bt into cm-14.0

Android 7.0.0 Release 14 (NBD90Z)

Change-Id: I634414c79b6cb207d22bb29dfb2854e96ae77e46

Change Summary

• modified: audio_a2dp_hw/audio_a2dp_hw.c
• modified: btif/src/btif_dm.c

Incremental Difference

--- a/audio_a2dp_hw/audio_a2dp_hw.c
+++ b/audio_a2dp_hw/audio_a2dp_hw.c
@@ -671,8 +671,7 @@ static ssize_t out_write(struct audio_stream_out *stream, const void* buffer,
                          size_t bytes)
 {
     struct a2dp_stream_out *out = (struct a2dp_stream_out *)stream;
-    int sent;
-    int us_delay;
+    int sent = -1;
     #ifdef BT_AUDIO_SYSTRACE_LOG
     char trace_buf[512];
     #endif
@@ -682,8 +681,8 @@ static ssize_t out_write(struct audio_stream_out *stream, const void* buffer,
     pthread_mutex_lock(&out->common.lock);
     if (out->common.state == AUDIO_A2DP_STATE_SUSPENDED ||
             out->common.state == AUDIO_A2DP_STATE_STOPPING) {
-        INFO("stream suspended or closing");
-        goto error;
+        DEBUG("stream suspended or closing");
+        goto finish;
     }
 
     /* only allow autostarting if we are in stopped or standby */
@@ -696,13 +695,13 @@ static ssize_t out_write(struct audio_stream_out *stream, const void* buffer,
         if (start_audio_datapath(&out->common) < 0)
 #endif
         {
-            goto error;
+            goto finish;
         }
     }
     else if (out->common.state != AUDIO_A2DP_STATE_STARTED)
     {
         ERROR("stream not in stopped or standby");
-        goto error;
+        goto finish;
     }
     #ifdef BT_AUDIO_SAMPLE_LOG
     if (outputpcmsamplefile)
@@ -751,26 +750,24 @@ static ssize_t out_write(struct audio_stream_out *stream, const void* buffer,
         } else {
             ERROR("write failed : stream suspended, avoid resetting state");
         }
-        goto error;
+        goto finish;
     }
 
+finish: ;
     const size_t frames = bytes / audio_stream_out_frame_size(stream);
     out->frames_rendered += frames;
     out->frames_presented += frames;
     pthread_mutex_unlock(&out->common.lock);
-    return bytes;
 
-error:
-    pthread_mutex_unlock(&out->common.lock);
-    us_delay = calc_audiotime(out->common.cfg, bytes);
-
-    DEBUG("emulate a2dp write delay (%d us)", us_delay);
-
-    usleep(us_delay);
+    // If send didn't work out, sleep to emulate write delay.
+    if (sent == -1) {
+        const int us_delay = calc_audiotime(out->common.cfg, bytes);
+        DEBUG("emulate a2dp write delay (%d us)", us_delay);
+        usleep(us_delay);
+    }
     return bytes;
 }
 
-
 static uint32_t out_get_sample_rate(const struct audio_stream *stream)
 {
     struct a2dp_stream_out *out = (struct a2dp_stream_out *)stream;

--- a/btif/src/btif_dm.c
+++ b/btif/src/btif_dm.c
@@ -1051,7 +1051,6 @@ static void btif_dm_pin_req_evt(tBTA_DM_PIN_REQ *p_pin_req)
             return;
         }
         if (check_cod(&bd_addr, COD_AV_HEADSETS) ||
-            check_cod(&bd_addr, COD_AV_HANDSFREE) ||
             check_cod(&bd_addr, COD_AV_HEADPHONES) ||
             check_cod(&bd_addr, COD_AV_PORTABLE_AUDIO) ||
             check_cod(&bd_addr, COD_AV_HIFI_AUDIO) ||