| Revisión | 46668229e9c01238c5eaf4a395844330d1177f4d (tree) |
|---|---|
| Tiempo | 2014-08-27 19:01:32 |
| Autor | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge tag 'android-4.4.4_r2' into kitkat-x86
Android 4.4.4 Release 2
include/hardware/bt_gatt_client.h (diff)
modules/usbaudio/audio_hw.c (diff)| @@ -278,7 +278,9 @@ typedef struct { | ||
| 278 | 278 | /** Set the advertising data or scan response data */ |
| 279 | 279 | bt_status_t (*set_adv_data)(int server_if, bool set_scan_rsp, bool include_name, |
| 280 | 280 | bool include_txpower, int min_interval, int max_interval, int appearance, |
| 281 | - uint16_t manufacturer_len, char* manufacturer_data); | |
| 281 | + uint16_t manufacturer_len, char* manufacturer_data, | |
| 282 | + uint16_t service_data_len, char* service_data, | |
| 283 | + uint16_t service_uuid_len, char* service_uuid); | |
| 282 | 284 | |
| 283 | 285 | /** Test mode interface */ |
| 284 | 286 | bt_status_t (*test_command)( int command, btgatt_test_params_t* params); |
| @@ -212,7 +212,7 @@ static ssize_t out_write(struct audio_stream_out *stream, const void* buffer, | ||
| 212 | 212 | |
| 213 | 213 | err: |
| 214 | 214 | pthread_mutex_unlock(&out->lock); |
| 215 | - | |
| 215 | + pthread_mutex_unlock(&out->dev->lock); | |
| 216 | 216 | if (ret != 0) { |
| 217 | 217 | usleep(bytes * 1000000 / audio_stream_frame_size(&stream->common) / |
| 218 | 218 | out_get_sample_rate(&stream->common)); |
Android-x86
Fork