OSDN Git Service
Pavlin Radoslavov [Fri, 14 Oct 2016 02:16:25 +0000 (02:16 +0000)]
Merge "BTIF A2DP Source and Sink refactor and cleanup" am:
afe49c0807 am:
3b77f09952 am:
9ba0a8e575
am:
1396f71526
Change-Id: I549465178e2cb8d29609933163b81db82a0bea76
Pavlin Radoslavov [Fri, 14 Oct 2016 02:12:49 +0000 (02:12 +0000)]
Merge "BTIF A2DP Source and Sink refactor and cleanup" am:
afe49c0807 am:
3b77f09952
am:
9ba0a8e575
Change-Id: I13b5d9eb87d3ae4e8342e53e1ec675515b2c499e
Pavlin Radoslavov [Fri, 14 Oct 2016 02:04:27 +0000 (02:04 +0000)]
Merge "BTIF A2DP Source and Sink refactor and cleanup" am:
afe49c0807
am:
3b77f09952
Change-Id: I227e533d847b069bc3159a7fd53c2e768cf5f529
Pavlin Radoslavov [Fri, 14 Oct 2016 02:02:27 +0000 (02:02 +0000)]
Merge "BTIF A2DP Source and Sink refactor and cleanup"
am:
afe49c0807
Change-Id: I3c0df19cac290ad3e7bc7122f91df25f7ec52514
Treehugger Robot [Fri, 14 Oct 2016 01:55:33 +0000 (01:55 +0000)]
Merge "BTIF A2DP Source and Sink refactor and cleanup"
Jakub Pawlowski [Fri, 14 Oct 2016 01:55:22 +0000 (01:55 +0000)]
Use proper socket type in uipc for non-android am:
7da3a4a70b am:
174f9687a6 am:
b728a25abb
am:
fcbda9a890
Change-Id: I32cf8141c53a1e31377105dfd523c2cf85a53833
Jakub Pawlowski [Fri, 14 Oct 2016 01:51:37 +0000 (01:51 +0000)]
Use proper socket type in uipc for non-android am:
7da3a4a70b am:
174f9687a6
am:
b728a25abb
Change-Id: I50a59b47d99f4873821b6ec81f066a17441df494
Jakub Pawlowski [Fri, 14 Oct 2016 01:43:54 +0000 (01:43 +0000)]
Use proper socket type in uipc for non-android am:
7da3a4a70b
am:
174f9687a6
Change-Id: I16779ac3e0a731c92411d4de695662b717f30e8e
Jakub Pawlowski [Fri, 14 Oct 2016 01:38:48 +0000 (01:38 +0000)]
Use proper socket type in uipc for non-android
am:
7da3a4a70b
Change-Id: Icf9577a80fda8742df82d1e1c3c7973a349ed146
Pavlin Radoslavov [Mon, 3 Oct 2016 01:34:46 +0000 (18:34 -0700)]
BTIF A2DP Source and Sink refactor and cleanup
* Moved bta/av/bta_av_sbc.c to stack/a2dp/a2d_sbc_up_sample.c
and renamed the corresponding bta_av_sbc_up_sample_* functions to
a2d_sbc_up_sample_*
Also, renamed bta_av_sbc_init_up_sample() to a2d_sbc_init_up_sample()
* Moved A2DP SBC Encoder-related tasks, state and constants from
btif_a2dp_source.cc to a2d_sbc_encoder.c
* Introduced A2DP encoder callbacks interface tA2D_ENCODER_INTERFACE,
and added A2D_GetEncoderInterface() to acccess the interface for a codec.
* Updated a2d_sbc_encoder_init() to specify callbacks:
- a2d_source_read_callback_t - a callback to read audio data for encoding
- a2d_source_enqueue_callback_t - a callback to enqueue A2DP source
packets for transmission
* Removed BTIF_MEDIA_TRSCD_* - the encoding is always PCM
* Removed conditionally defined constants and replaced them by
local definitions:
- BTIF_MEDIA_BITRATE_STEP -> A2D_SBC_BITRATE_STEP
- BTIF_A2DP_DEFAULT_BITRATE -> A2D_SBC_DEFAULT_BITRATE
- BTIF_A2DP_NON_EDR_MAX_RATE -> A2D_SBC_NON_EDR_MAX_RATE
* Hard-coded the read data timeout period A2DP_DATA_READ_POLL_MS to 10ms
* Merged the UNDERRUN read errors into the UNDERFLOW errors.
* Removed the following statistics, because they are not very useful:
- media_read_total_limited_frames
- media_read_max_limited_frames
- media_read_limited_count
- media_read_total_expected_frames
- media_read_max_expected_frames
- media_read_expected_count
* Updated the implementation of buffer_overruns_max_count to
use the (new) counter tx_queue_max_dropped_messages instead of
media_read_max_expected_frames
* Replaced usage of LOG_DEBUG() in stack/a2d/ with LOG_VERBOSE():
the former is enabled by default on some of the builds.
* Renamed:
- btif_a2dp_sink_audio_focus_state_t -> btif_a2dp_sink_focus_state_t
- btif_a2dp_sink_set_audio_focus_state_req() ->
btif_a2dp_sink_set_focus_state_req()
- tBTIF_A2DP_SINK_CB.RxSbcQ -> rx_audio_queue
- btif_a2dp_source_start_aa_req() -> btif_a2dp_source_start_audio_req()
- btif_a2dp_source_stop_aa_req() -> btif_a2dp_source_stop_audio_req()
- btif_a2dp_source_aa_readbuf() -> btif_a2dp_source_audio_readbuf()
- tBTIF_A2DP_SOURCE_CB.TxAaQ -> tx_audio_queue
- BTIF_A2DP_SOURCE_MEDIA_TIMER_MS -> A2D_SBC_ENCODER_INTERVAL_MS
- tA2D_AV_MEDIA_FEEDINGS -> tA2D_FEEDING_PARAMS
- tBTIF_A2DP_SOURCE_INIT_AUDIO -> tA2D_ENCODER_INIT_PARAMS
- tBTIF_A2DP_SOURCE_UPDATE_AUDIO -> tA2D_ENCODER_UPDATE_PARAMS
- tBTIF_A2DP_SOURCE_INIT_AUDIO_FEEDING -> tBTIF_A2DP_SOURCE_INIT_FEEDING
Bug:
30958229
Test: TestTracker/65192
Change-Id: Iba0a9694bda3dba73f211f1bde25821497fa6a06
Jakub Pawlowski [Thu, 13 Oct 2016 23:10:50 +0000 (23:10 +0000)]
Update BUILD.gn files am:
cc8d3abf78 am:
091b4ce8ac am:
41b6495077
am:
d1b36f66ab
Change-Id: I1f659de46e9937c315fde0b6ceff5c62e2b41f0a
Jakub Pawlowski [Thu, 13 Oct 2016 23:06:53 +0000 (23:06 +0000)]
Update BUILD.gn files am:
cc8d3abf78 am:
091b4ce8ac
am:
41b6495077
Change-Id: Ia589eb27bef47864d4b57ef0a1417b01e3d7b15c
Jakub Pawlowski [Thu, 13 Oct 2016 22:59:13 +0000 (22:59 +0000)]
Update BUILD.gn files am:
cc8d3abf78
am:
091b4ce8ac
Change-Id: If532a967b15de43a0c870ad77df6811b807f5951
Jakub Pawlowski [Thu, 13 Oct 2016 22:46:30 +0000 (15:46 -0700)]
Use proper socket type in uipc for non-android
Change-Id: I5e901ca381c816945146b508770a2aa54d9cdd79
Jakub Pawlowski [Thu, 13 Oct 2016 22:57:13 +0000 (22:57 +0000)]
Update BUILD.gn files
am:
cc8d3abf78
Change-Id: I6b67b339e78b98d871aabd8ab49a15300614da6b
Jakub Pawlowski [Thu, 13 Oct 2016 22:43:15 +0000 (15:43 -0700)]
Update BUILD.gn files
Test: compiled using ninja
Pavlin Radoslavov [Thu, 13 Oct 2016 21:16:09 +0000 (21:16 +0000)]
Split btif_media_task into Source, Sink and Control am:
08406e93e6 am:
774907f34e am:
b7edc3485a
am:
f9f772257c
Change-Id: I37fd9cad67a42ef43016e698eb67345dd2565847
Pavlin Radoslavov [Thu, 13 Oct 2016 21:14:32 +0000 (21:14 +0000)]
Split btif_media_task into Source, Sink and Control am:
08406e93e6 am:
774907f34e
am:
b7edc3485a
Change-Id: Ib492b939faf4bae9ba885c3d535b27e29aada4a6
Pavlin Radoslavov [Thu, 13 Oct 2016 21:09:35 +0000 (21:09 +0000)]
Split btif_media_task into Source, Sink and Control am:
08406e93e6
am:
774907f34e
Change-Id: I649bf1a513d69cdbb3c803dff6fc393e7306a565
Pavlin Radoslavov [Thu, 13 Oct 2016 21:07:35 +0000 (21:07 +0000)]
Split btif_media_task into Source, Sink and Control
am:
08406e93e6
Change-Id: Iee5abd974f0c6973d4bbe482f7b34fa9e8a8fe3a
Pavlin Radoslavov [Fri, 23 Sep 2016 23:36:47 +0000 (16:36 -0700)]
Split btif_media_task into Source, Sink and Control
* btif/include/btif_a2dp.h and btif/src/btif_a2dp.cc implement
the entry points for the BTIF A2DP module.
* btif/include/btif_a2dp_source.h and btif/src/btif_a2dp_source.cc implement
the BTIF A2DP Source component.
* btif/include/btif_a2dp_sink.h and btif/src/btif_a2dp_sink.cc implement
the BTIF A2DP Sink component.
* btif/include/btif_a2dp_control.h and btif/src/btif_a2dp_control.cc
implement the A2DP control mechanism for the audio channel from the
Media Framework.
Also:
* Removed BTA_AV_SBC_HDR_SIZE and used A2D_SBC_MPL_HDR_LEN instead.
* Removed BTIF_AV_SINK_FOCUS_REQ_EVT, because it is not used.
* Removed many of the "#if (BTA_AV_SINK_INCLUDED == TRUE)" guards.
* Removed "#ifdef USE_AUDIO_TRACK" guard, and always compile the
corresponding code.
* Removed tBTIF_AV_MEDIA_FEEDINGS_PCM_STATE and moved its state
to tBTIF_AV_MEDIA_FEEDINGS_STATE .
Bug:
30958229
Test: TestTracker/65192
Change-Id: I20bc52a1d7a7f03c92628a1562f14b7df3ebb445
Marie Janssen [Thu, 13 Oct 2016 00:47:01 +0000 (00:47 +0000)]
Merge "cleanup: Remove BT_USE_TRACES and BT_TRACE_APPL" am:
14b3339e71 am:
0a859dabf8 am:
68f5854072
am:
0233cee19d
Change-Id: Ie10d53ecf8bb0a6dcd88979e87b313795225b7c4
Marie Janssen [Thu, 13 Oct 2016 00:41:33 +0000 (00:41 +0000)]
Merge "cleanup: Remove BT_USE_TRACES and BT_TRACE_APPL" am:
14b3339e71 am:
0a859dabf8
am:
68f5854072
Change-Id: Ibf813eba7a6748997c5693c28ab23b339a22e854
Marie Janssen [Thu, 13 Oct 2016 00:36:16 +0000 (00:36 +0000)]
Merge "cleanup: Remove BT_USE_TRACES and BT_TRACE_APPL" am:
14b3339e71
am:
0a859dabf8
Change-Id: I5cb910083965293b8aca2d37afbf7d02aa2f5cd6
Marie Janssen [Thu, 13 Oct 2016 00:27:13 +0000 (00:27 +0000)]
Merge "cleanup: Remove BT_USE_TRACES and BT_TRACE_APPL"
am:
14b3339e71
Change-Id: Id0d90c7ff59b86b9b685a635ef894c835c2ca1f9
Treehugger Robot [Thu, 13 Oct 2016 00:22:49 +0000 (00:22 +0000)]
Merge "cleanup: Remove BT_USE_TRACES and BT_TRACE_APPL"
Pavlin Radoslavov [Wed, 12 Oct 2016 23:11:53 +0000 (23:11 +0000)]
Fix file permissions for source code files am:
fdd641e512 am:
6046658298 am:
ec94a1259f
am:
7f34882438
Change-Id: Ia7efab59c3b724e47909372ddcad88bf5c91120a
Pavlin Radoslavov [Wed, 12 Oct 2016 23:05:34 +0000 (23:05 +0000)]
Fix file permissions for source code files am:
fdd641e512 am:
6046658298
am:
ec94a1259f
Change-Id: Ia2cd3c85eb64b0c69a872da1475753728f1a5b27
Pavlin Radoslavov [Wed, 12 Oct 2016 23:00:03 +0000 (23:00 +0000)]
Fix file permissions for source code files am:
fdd641e512
am:
6046658298
Change-Id: I581da1e3d2180a10cedaa8d03721769ba3b83ef6
Pavlin Radoslavov [Wed, 12 Oct 2016 22:50:07 +0000 (22:50 +0000)]
Fix file permissions for source code files
am:
fdd641e512
Change-Id: I80c163e8bfc2ba6f087b60dcc8833bd373289f35
Pavlin Radoslavov [Wed, 12 Oct 2016 19:54:05 +0000 (12:54 -0700)]
Fix file permissions for source code files
Removed file execute permissions for:
- bta/include/bta_hh_co.h
- embdrv/sbc/decoder/Android.mk
- embdrv/sbc/Android.mk
- embdrv/Android.mk
- btif/co/bta_ag_co.cc
Test: visual inspection of file permissions
Change-Id: I746debb1e8ceaa1cc14f867641b25cb42c04c7be
Marie Janssen [Wed, 12 Oct 2016 19:40:57 +0000 (12:40 -0700)]
cleanup: Remove BT_USE_TRACES and BT_TRACE_APPL
Test: mma in system/bt
Change-Id: I357eb44a97f3935262252cf97c13cef078a95e4d
Zach Johnson [Wed, 12 Oct 2016 17:26:55 +0000 (17:26 +0000)]
Merge "Fix HFP AT command BIA failures" into cw-f-dev am:
68b0ac8b42
am:
d2e4941d93
Change-Id: I3541973c12ddb1844bc36fde91b566063f284b61
Devin Kim [Wed, 12 Oct 2016 17:26:45 +0000 (17:26 +0000)]
Fix HFP AT command BIA failures am:
1b3e27469d
am:
0b7ff8d856
Change-Id: I879f864059fd105647ecd97337743ba1834cf6e8
Zach Johnson [Wed, 12 Oct 2016 17:19:18 +0000 (17:19 +0000)]
Merge "Fix HFP AT command BIA failures" into cw-f-dev
am:
68b0ac8b42
Change-Id: Ib0b7acd72e0459f4c1ebc5a4a4635e87350eb043
Devin Kim [Wed, 12 Oct 2016 17:19:17 +0000 (17:19 +0000)]
Fix HFP AT command BIA failures
am:
1b3e27469d
Change-Id: I9ac298b5a6d3d80b8ca6cc59e9c48f84c2c23e67
Zach Johnson [Wed, 12 Oct 2016 17:08:27 +0000 (17:08 +0000)]
Merge "Fix HFP AT command BIA failures" into cw-f-dev
Marie Janssen [Wed, 12 Oct 2016 16:46:08 +0000 (16:46 +0000)]
Merge "btif: migrate from pthread locks to std::mutex" am:
84ada302fe am:
d88f6a183c am:
2f351e9cea
am:
98d8f6136e
Change-Id: Ib799a3444c4e2baffc4be72ee7585977207f8c83
Marie Janssen [Wed, 12 Oct 2016 16:38:36 +0000 (16:38 +0000)]
Merge "btif: migrate from pthread locks to std::mutex" am:
84ada302fe am:
d88f6a183c
am:
2f351e9cea
Change-Id: I50607e319fdd1bb1c88e57835ae2a0418fc5f5bf
Marie Janssen [Wed, 12 Oct 2016 16:33:59 +0000 (16:33 +0000)]
Merge "btif: migrate from pthread locks to std::mutex" am:
84ada302fe
am:
d88f6a183c
Change-Id: I56962683a83454426f1bb35959f3a60a6105c6c5
Marie Janssen [Wed, 12 Oct 2016 16:24:43 +0000 (16:24 +0000)]
Merge "btif: migrate from pthread locks to std::mutex"
am:
84ada302fe
Change-Id: Ifab7477d07b3f49aa2469bdc6f0fae68f2f948f7
Devin Kim [Wed, 7 Sep 2016 04:47:47 +0000 (13:47 +0900)]
Fix HFP AT command BIA failures
Running the PTE test case TC_AG_IIA_BV_01_I, a failure occurs due to
missing initialization of tBTA_AG_VAL.
Bug:
31325270
Test: PTS
Change-Id: I683eccd53d40e79ec03545166b18ffa1922f0fb2
Marie Janssen [Wed, 12 Oct 2016 16:17:42 +0000 (16:17 +0000)]
Merge "btif: migrate from pthread locks to std::mutex"
Pavlin Radoslavov [Wed, 12 Oct 2016 02:57:04 +0000 (02:57 +0000)]
Moved the typedef of period_ms_t from alarm.h to time.h am:
d92fc91abb am:
0df62ad6c6 am:
6cfcd7d1db
am:
85cb5d1a33
Change-Id: I8aa7fa1cb5128a80f3d27ac74bb22ed71b34fc85
Pavlin Radoslavov [Wed, 12 Oct 2016 02:50:42 +0000 (02:50 +0000)]
Moved the typedef of period_ms_t from alarm.h to time.h am:
d92fc91abb am:
0df62ad6c6
am:
6cfcd7d1db
Change-Id: I8341cd7b335664763d7e837d0a453766e7d522e8
Pavlin Radoslavov [Wed, 12 Oct 2016 02:45:50 +0000 (02:45 +0000)]
Moved the typedef of period_ms_t from alarm.h to time.h am:
d92fc91abb
am:
0df62ad6c6
Change-Id: I51c08d7dba2a316424a995c4d6a6429117010972
Pavlin Radoslavov [Wed, 12 Oct 2016 02:36:55 +0000 (02:36 +0000)]
Moved the typedef of period_ms_t from alarm.h to time.h
am:
d92fc91abb
Change-Id: Ied9b5b09295972e29b67ba605098ad1e51c742fb
Pavlin Radoslavov [Wed, 12 Oct 2016 00:46:45 +0000 (17:46 -0700)]
Moved the typedef of period_ms_t from alarm.h to time.h
Test: code compilation
Change-Id: Ib61126d7921d088b045dca6c5b69a5379603fcc3
Marie Janssen [Mon, 10 Oct 2016 20:38:30 +0000 (13:38 -0700)]
btif: migrate from pthread locks to std::mutex
Test: run unit tests / sanity connection to devices
Change-Id: I293c3600affd229fea67cdd6624eba7f186cbcb7
Stephen Li [Tue, 11 Oct 2016 17:54:29 +0000 (17:54 +0000)]
Manually merge commit '
cc15f06acc3a1447318fefae00b3c10d9b7ae42a' to fix automerger am:
9ad78d6513 am:
8ac85b2361 am:
fb6d60efd7
am:
f60e6f92d6
Change-Id: I06019bf97c252c44b199fa26372f95bcc8d93636
Marie Janssen [Tue, 11 Oct 2016 17:54:16 +0000 (17:54 +0000)]
stack: remove dead (#if 0'd) code am:
af7b39e595 am:
140f7c1dfd am:
0439d33163
am:
6d78924b1c
Change-Id: I01d2ffb1f02900d1294a7ce7e4889371309328e5
Ajay Panicker [Tue, 11 Oct 2016 17:54:04 +0000 (17:54 +0000)]
Fix improper connection check for absolute volume am:
446df0360e am:
a3d9a4fe1f am:
04d76dcf14
am:
bb7694dfe5
Change-Id: I100b60ca785ca8b26ee0f6952c287db402785221
George Burgess IV [Tue, 11 Oct 2016 17:53:52 +0000 (17:53 +0000)]
Replace all uses of sprintf() with snprint() am:
80d7f60680 am:
9b0247eb7f am:
9b943e7eed
am:
d34293ac34
Change-Id: If3e5c9cdeb43d79ffaa9b902f438f6baf4333c86
Andre Eisenbach [Tue, 11 Oct 2016 17:53:42 +0000 (17:53 +0000)]
Merge "Revert "Add dumpsys support for LE connection parameter updates"" am:
b2f7a959fd am:
34b83d600c am:
f06af0cd46
am:
6b5cac7d75
Change-Id: Ied3f78bbf9180919269f076346d76daf96767ab6
Andre Eisenbach [Tue, 11 Oct 2016 17:53:30 +0000 (17:53 +0000)]
Remove Jabra headsets from absolute volume blacklist am:
98c7415e95 am:
ecc90d0f7b am:
1c25f2abd6
am:
88edc0b560
Change-Id: I0a2d4eff2acd23a3cdcd5e3a750107367d73e40f
Jakub Pawlowski [Tue, 11 Oct 2016 17:52:21 +0000 (17:52 +0000)]
Convert advertising HAL from struct into class (3/3) am:
74ef54b440 am:
90b9015e77 am:
f3b6c2a566
am:
fa10bcf5e2
Change-Id: Ia685bcef2a77f384c341c8e89965e22f5f3af027
Jakub Pawlowski [Tue, 11 Oct 2016 17:52:03 +0000 (17:52 +0000)]
Merge "Remove return value of BTM_VendorSpecificCommand function" am:
d4b958bced am:
459373a3d0 am:
9d6cf09525
am:
0fde896da5
Change-Id: Ib3e362dedff548cb5e341830ca2a464a9dc16d9a
Stephen Li [Tue, 11 Oct 2016 17:48:10 +0000 (17:48 +0000)]
Manually merge commit '
cc15f06acc3a1447318fefae00b3c10d9b7ae42a' to fix automerger am:
9ad78d6513 am:
8ac85b2361
am:
fb6d60efd7
Change-Id: I26739f40b456f7d01a588a81ff33b3bd76a30a47
Marie Janssen [Tue, 11 Oct 2016 17:47:59 +0000 (17:47 +0000)]
stack: remove dead (#if 0'd) code am:
af7b39e595 am:
140f7c1dfd
am:
0439d33163
Change-Id: I39041eff68527fdc73d3971a8294d34483dd714f
Ajay Panicker [Tue, 11 Oct 2016 17:47:47 +0000 (17:47 +0000)]
Fix improper connection check for absolute volume am:
446df0360e am:
a3d9a4fe1f
am:
04d76dcf14
Change-Id: Ib0468696f933b3263ab950688af076df3c309115
George Burgess IV [Tue, 11 Oct 2016 17:47:35 +0000 (17:47 +0000)]
Replace all uses of sprintf() with snprint() am:
80d7f60680 am:
9b0247eb7f
am:
9b943e7eed
Change-Id: If7c92a9a9e4c353a8fae189f56ef1c305af164e0
Andre Eisenbach [Tue, 11 Oct 2016 17:47:23 +0000 (17:47 +0000)]
Merge "Revert "Add dumpsys support for LE connection parameter updates"" am:
b2f7a959fd am:
34b83d600c
am:
f06af0cd46
Change-Id: I9c666513978590c8ec2fead462057adf339bb65d
Andre Eisenbach [Tue, 11 Oct 2016 17:47:11 +0000 (17:47 +0000)]
Remove Jabra headsets from absolute volume blacklist am:
98c7415e95 am:
ecc90d0f7b
am:
1c25f2abd6
Change-Id: Ib21cd8d3297010ecee959d7a43d0033d576019a1
Jakub Pawlowski [Tue, 11 Oct 2016 17:46:07 +0000 (17:46 +0000)]
Convert advertising HAL from struct into class (3/3) am:
74ef54b440 am:
90b9015e77
am:
f3b6c2a566
Change-Id: Ib090a816dcc7c65dbfeafc746b7cee95f5ce787b
Jakub Pawlowski [Tue, 11 Oct 2016 17:45:52 +0000 (17:45 +0000)]
Merge "Remove return value of BTM_VendorSpecificCommand function" am:
d4b958bced am:
459373a3d0
am:
9d6cf09525
Change-Id: Ic090db35b4174ebc2cc8b6dcb62b6afbbcb7cab3
Stephen Li [Tue, 11 Oct 2016 17:42:30 +0000 (17:42 +0000)]
Manually merge commit '
cc15f06acc3a1447318fefae00b3c10d9b7ae42a' to fix automerger am:
9ad78d6513
am:
8ac85b2361
Change-Id: I169323587b9a57c3ce8dbad4e2b328244d3d43e4
Marie Janssen [Tue, 11 Oct 2016 17:42:18 +0000 (17:42 +0000)]
stack: remove dead (#if 0'd) code am:
af7b39e595
am:
140f7c1dfd
Change-Id: I78a6c99c9711829f04316efccba9513d0eafa40a
Ajay Panicker [Tue, 11 Oct 2016 17:42:08 +0000 (17:42 +0000)]
Fix improper connection check for absolute volume am:
446df0360e
am:
a3d9a4fe1f
Change-Id: I4c8b215f0baec13b5bbe174dc38c216177e81752
George Burgess IV [Tue, 11 Oct 2016 17:41:56 +0000 (17:41 +0000)]
Replace all uses of sprintf() with snprint() am:
80d7f60680
am:
9b0247eb7f
Change-Id: I1f7c64866a7ffc2c34405049074d6699906e4c1c
Andre Eisenbach [Tue, 11 Oct 2016 17:41:45 +0000 (17:41 +0000)]
Merge "Revert "Add dumpsys support for LE connection parameter updates"" am:
b2f7a959fd
am:
34b83d600c
Change-Id: Id4701d42adbd07672659e6a7ad46114f5e454e17
Andre Eisenbach [Tue, 11 Oct 2016 17:41:34 +0000 (17:41 +0000)]
Remove Jabra headsets from absolute volume blacklist am:
98c7415e95
am:
ecc90d0f7b
Change-Id: I4d432404d0e2e3d9b1dcf9bb02bd917e4a51837f
Jakub Pawlowski [Tue, 11 Oct 2016 17:40:26 +0000 (17:40 +0000)]
Convert advertising HAL from struct into class (3/3) am:
74ef54b440
am:
90b9015e77
Change-Id: I420874bb6bc76741324f73e8b31c40418c8b36ee
Jakub Pawlowski [Tue, 11 Oct 2016 17:40:11 +0000 (17:40 +0000)]
Merge "Remove return value of BTM_VendorSpecificCommand function" am:
d4b958bced
am:
459373a3d0
Change-Id: Ia5118dcea23fa15a5f907b9653ad2ff41a4e52ec
Stephen Li [Tue, 11 Oct 2016 17:35:51 +0000 (17:35 +0000)]
Manually merge commit '
cc15f06acc3a1447318fefae00b3c10d9b7ae42a' to fix automerger
am:
9ad78d6513
Change-Id: Ie67f15b078eeb20862cafce05ecca598bcbad6ab
Marie Janssen [Tue, 11 Oct 2016 17:35:41 +0000 (17:35 +0000)]
stack: remove dead (#if 0'd) code
am:
af7b39e595
Change-Id: I2932190abc5c3553271419461c91afc96881aa23
Ajay Panicker [Tue, 11 Oct 2016 17:35:30 +0000 (17:35 +0000)]
Fix improper connection check for absolute volume
am:
446df0360e
Change-Id: I72486575e10b46f8efb19c833210ae63d60a8bbb
George Burgess IV [Tue, 11 Oct 2016 17:35:20 +0000 (17:35 +0000)]
Replace all uses of sprintf() with snprint()
am:
80d7f60680
Change-Id: I6a988bb6bfe61aaab1e05318b21be545b48f7e0f
Andre Eisenbach [Tue, 11 Oct 2016 17:35:10 +0000 (17:35 +0000)]
Merge "Revert "Add dumpsys support for LE connection parameter updates""
am:
b2f7a959fd
Change-Id: Id532466a62d7100feedea66f7e09fec9e0c1ddba
Andre Eisenbach [Tue, 11 Oct 2016 17:35:00 +0000 (17:35 +0000)]
Remove Jabra headsets from absolute volume blacklist
am:
98c7415e95
Change-Id: Ib34049bc751e0d8b423d1a38ae4cf698bc97fd73
Jakub Pawlowski [Tue, 11 Oct 2016 17:33:13 +0000 (17:33 +0000)]
Convert advertising HAL from struct into class (3/3)
am:
74ef54b440
Change-Id: I66f71a46d96d03de4dbe57fa3d38fd2cf2b6239f
Jakub Pawlowski [Tue, 11 Oct 2016 17:32:58 +0000 (17:32 +0000)]
Merge "Remove return value of BTM_VendorSpecificCommand function"
am:
d4b958bced
Change-Id: I5d3b90dd514ea5c5170eaed4124ec4449db3ebe9
Stephen Li [Tue, 11 Oct 2016 17:27:31 +0000 (10:27 -0700)]
Manually merge commit '
cc15f06acc3a1447318fefae00b3c10d9b7ae42a' to fix
automerger
BUG:
32069275
Change-Id: I60cc50b21fe0d5a5464bd3acc5897ba7c4e05b73
Marie Janssen [Mon, 10 Oct 2016 16:49:14 +0000 (09:49 -0700)]
stack: remove dead (#if 0'd) code
Test: compiles
Change-Id: I34f68c2b166a28622155358ff75478af8d18bed0
Ajay Panicker [Tue, 11 Oct 2016 03:43:42 +0000 (20:43 -0700)]
Fix improper connection check for absolute volume
Test: Manually tested
Bug:
32060762
Change-Id: Ia6ca97c119d421aef1136f97afccb3f0c126334d
George Burgess IV [Wed, 2 Mar 2016 22:00:19 +0000 (14:00 -0800)]
Replace all uses of sprintf() with snprint()
- sprintf() does not limit the length of the character string when writing
to a buffer and may result in buffer overflow
- snprintf() requires the maximum write length as a parameter. When the
maximum length supported is smaller than the reserved buffer length,
the call will not result in buffer overflow
Bug:
31859081
Test: TestTracker/64195/3975
Change-Id: I519f8ef7b9b162fd79094f89148250d783c734c0
Treehugger Robot [Mon, 10 Oct 2016 23:44:10 +0000 (23:44 +0000)]
Merge "Revert "Add dumpsys support for LE connection parameter updates""
Joseph Pirozzo [Mon, 10 Oct 2016 22:54:07 +0000 (22:54 +0000)]
Merge "L2CAP: Ensure handle is not null before attempting to close a socket" am:
171c14eae0 am:
eee39a51e6 am:
d9bd1d15c2
am:
67e450fb89
Change-Id: Ie6197477da3bf5e96b57749d3fe3e035570d2db7
Jakub Pawlowski [Mon, 10 Oct 2016 22:53:39 +0000 (22:53 +0000)]
Remove return value from btsnd_hcic_* functions am:
763abdfe79 am:
83eb6b9d71 am:
c846a8448d
am:
947305d348
Change-Id: I899fea7dd6e5a04d3e1c5694d30f5652b5cfb988
Jakub Pawlowski [Mon, 10 Oct 2016 22:53:33 +0000 (22:53 +0000)]
Ignore return value of btsnd_hcic_* functions am:
b6ab9b3af6 am:
bf1ff14834 am:
4e0e0fe522
am:
cc0d806149
Change-Id: I164ed1ef613b73a31cd89ee5a6a661390fa9aa3b
Andre Eisenbach [Tue, 13 Sep 2016 16:57:51 +0000 (09:57 -0700)]
Remove Jabra headsets from absolute volume blacklist
Firmware fixes are available for affected headsets (Thanks, Jabra!!).
Change-Id: I60b42366d1e8155895cc58fff69f6404415a0406
Joseph Pirozzo [Mon, 10 Oct 2016 22:44:42 +0000 (22:44 +0000)]
Merge "L2CAP: Ensure handle is not null before attempting to close a socket" am:
171c14eae0 am:
eee39a51e6
am:
d9bd1d15c2
Change-Id: Ib82bd66671d064876c6e99623fe6f9b53dbe90c8
Jakub Pawlowski [Mon, 10 Oct 2016 22:44:22 +0000 (22:44 +0000)]
Remove return value from btsnd_hcic_* functions am:
763abdfe79 am:
83eb6b9d71
am:
c846a8448d
Change-Id: I67241af4df6314ca80b0d86cc3751405ee092c2d
Jakub Pawlowski [Mon, 10 Oct 2016 22:44:16 +0000 (22:44 +0000)]
Ignore return value of btsnd_hcic_* functions am:
b6ab9b3af6 am:
bf1ff14834
am:
4e0e0fe522
Change-Id: I01c91b569afeb4dc0504f28b9420cf3bc848ef3f
Joseph Pirozzo [Mon, 10 Oct 2016 22:28:20 +0000 (22:28 +0000)]
Merge "L2CAP: Ensure handle is not null before attempting to close a socket" am:
171c14eae0
am:
eee39a51e6
Change-Id: I208840b1bf2927ce0b14ef853ae801447e377926
Jakub Pawlowski [Mon, 10 Oct 2016 22:28:02 +0000 (22:28 +0000)]
Remove return value from btsnd_hcic_* functions am:
763abdfe79
am:
83eb6b9d71
Change-Id: I43c09615eccb67a8c079a5b1ac25325acc254b5a
Jakub Pawlowski [Mon, 10 Oct 2016 22:27:57 +0000 (22:27 +0000)]
Ignore return value of btsnd_hcic_* functions am:
b6ab9b3af6
am:
bf1ff14834
Change-Id: I1c4ccf0bc72c73be53018882c716a325e908812b
Jakub Pawlowski [Thu, 6 Oct 2016 23:52:30 +0000 (16:52 -0700)]
Convert advertising HAL from struct into class (3/3)
Bug:
30622771
Test: all related tests were updated
Change-Id: I9695284ae249fa427ae4b2f3e9649da951102c6c
Treehugger Robot [Mon, 10 Oct 2016 22:21:36 +0000 (22:21 +0000)]
Merge "Remove return value of BTM_VendorSpecificCommand function"
Jakub Pawlowski [Mon, 10 Oct 2016 19:36:49 +0000 (12:36 -0700)]
Remove return value of BTM_VendorSpecificCommand function
The return value of BTM_VendorSpecificCommand is currently just an
information wether the callback was passed to it or not, but many places
through stack use this value as error indication. Remove it.
Test: unit tests pass
Change-Id: Idf73fc49fb25e52c3aeb64f2305b4498ecacd9a4
Andre Eisenbach [Thu, 6 Oct 2016 22:42:22 +0000 (22:42 +0000)]
Revert "Add dumpsys support for LE connection parameter updates"
Reverting for now after talking to Jacky because this causes circular dependencies as lower layer (stack/) functions are calling higher layer APIs (btif/) directly.
To restore a change like this, the data should be collected at a lower layer in the stack and reported through polling or a callback.
This reverts commit
8ec8ca4a875eed8b28e6714899f49781537411ae.
Change-Id: I748843864ae7198ea021fe70d2643a62097ab029
OSDN Git Service
