diff options
| author | Bill Yi <byi@google.com> | 2014-04-29 11:34:21 -0700 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2014-04-29 11:34:21 -0700 |
| commit | 08e9b2a43d43a23067e577b5bd83a41964e70107 (patch) | |
| tree | bba1103440af30c8275cde7dbe09866069680afe | |
| parent | c070bad435799b4febdd2acf6be6c191f15f724e (diff) | |
| parent | f404dc42d6677a1aee88d1ce996a7e8e4afe55bb (diff) | |
| download | libhardware-08e9b2a43d43a23067e577b5bd83a41964e70107.tar.gz | |
Merge commit 'f404dc42d6677a1aee88d1ce996a7e8e4afe55bb' into HEAD
| -rw-r--r-- | include/hardware/bt_gatt_client.h | 4 | ||||
| -rw-r--r-- | modules/usbaudio/audio_hw.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/hardware/bt_gatt_client.h b/include/hardware/bt_gatt_client.h index d6b0cb40..cf4fabed 100644 --- a/include/hardware/bt_gatt_client.h +++ b/include/hardware/bt_gatt_client.h @@ -278,7 +278,9 @@ typedef struct { /** Set the advertising data or scan response data */ bt_status_t (*set_adv_data)(int server_if, bool set_scan_rsp, bool include_name, bool include_txpower, int min_interval, int max_interval, int appearance, - uint16_t manufacturer_len, char* manufacturer_data); + uint16_t manufacturer_len, char* manufacturer_data, + uint16_t service_data_len, char* service_data, + uint16_t service_uuid_len, char* service_uuid); /** Test mode interface */ bt_status_t (*test_command)( int command, btgatt_test_params_t* params); diff --git a/modules/usbaudio/audio_hw.c b/modules/usbaudio/audio_hw.c index f33c3436..24a2d63a 100644 --- a/modules/usbaudio/audio_hw.c +++ b/modules/usbaudio/audio_hw.c @@ -212,7 +212,7 @@ static ssize_t out_write(struct audio_stream_out *stream, const void* buffer, err: pthread_mutex_unlock(&out->lock); - + pthread_mutex_unlock(&out->dev->lock); if (ret != 0) { usleep(bytes * 1000000 / audio_stream_frame_size(&stream->common) / out_get_sample_rate(&stream->common)); |