OSDN Git Service
Pavlin Radoslavov [Wed, 24 Aug 2016 17:42:22 +0000 (10:42 -0700)]
Don't set the A2DP sink data callback when registering A2DP source
The p_sink_data_cback pointer should be NULL when registering
A2DP source with BTA_AvRegister()
Change-Id: I1a709c4e0d3cfe6faf0368a013b391c6e6a53a82
Treehugger Robot [Wed, 24 Aug 2016 20:55:54 +0000 (20:55 +0000)]
Merge "Removed unused log-related defines and typedefs"
Jakub Pawlowski [Wed, 10 Aug 2016 16:07:44 +0000 (09:07 -0700)]
Make it possible to post closures to BTA message queue
Currently, every task executed on bta thread needs a separate event id,
structure holding its parameters, API method, and method that will be
executed in bta thread, which must accept generic tBTA_DM_MSG.
Because of that we end up with lots of boilerplate code, and possibility
to misinterpret bytes in tBTA_DM_MSG struct.
After this patch, we can post closures onto bta thread. Thanks to it we
don't need a struct to hold parameters, and the executed method can have
a meaningful parameters.
First experiments showed over 50% reduction in code size when rewriting
advertising code to new style, not to mention much better readability.
Bug:
30622771
Change-Id: I400839b920c04c67c893899969d07a02d9c1b2e6
Bill Yi [Wed, 24 Aug 2016 18:18:47 +0000 (11:18 -0700)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Pavlin Radoslavov [Wed, 24 Aug 2016 18:01:42 +0000 (11:01 -0700)]
Removed unused log-related defines and typedefs
Change-Id: I794f07821a653f03e02cb5ad11790dfe2dfaea98
Myles Watson [Tue, 21 Jun 2016 23:45:02 +0000 (16:45 -0700)]
test_vendor: Build independently from the stack
Remove the dependency on bluetooth_* flags.
Enable more warnings.
(Based on the build flags in system/bt/Android.mk)
Change-Id: I5f480f15c037955404502a0216b61aa407670163
Signed-off-by: Myles Watson <mylesgw@google.com>
Myles Watson [Wed, 24 Aug 2016 16:03:32 +0000 (09:03 -0700)]
test_vendor: Fix style for UNUSED_ATTR, whitespace
Remove "/* args */" and use UNUSED_ATTR. It's easier to find using grep.
Change-Id: Ic1a95e44b86d019647acafe982cfef5c69e1da1a
Signed-off-by: Myles Watson <mylesgw@google.com>
Pavlin Radoslavov [Wed, 24 Aug 2016 09:01:30 +0000 (09:01 +0000)]
Fix a typo: __func_ -> __func__
am:
3e0f253c28
Change-Id: I4309954020a7630fa1dc4eca766fc12e982fbefc
Pavlin Radoslavov [Wed, 24 Aug 2016 08:44:41 +0000 (01:44 -0700)]
Fix a typo: __func_ -> __func__
Change-Id: I8b6f0664a96932c35a804541d54a50370d09c022
Pavlin Radoslavov [Wed, 24 Aug 2016 05:17:32 +0000 (05:17 +0000)]
A2DP-related naming refactoring and cleanup
am:
7aaf7c6c42
Change-Id: I2420388d1335ab2ff9edef957ed0934433e3e63e
Pavlin Radoslavov [Tue, 23 Aug 2016 19:24:03 +0000 (12:24 -0700)]
A2DP-related naming refactoring and cleanup
* Renamed A2DP-related function names, types, constants and fields.
Also, move some of those functions to a better location.
- tAVDT_DATA_CBACK -> tAVDT_SINK_DATA_CBACK
- tAVDT_MEDIA_CBACK -> tAVDT_SINK_MEDIA_CBACK
- p_data_cback -> p_sink_data_cback
- p_media_cback -> p_sink_media_cback
- p_app_data_cback -> p_app_sink_data_cback
- tBTA_AV_DATA_CBACK -> tBTA_AV_SINK_DATA_CBACK
- BTA_AV_MEDIA_SINK_CFG_EVT -> BTA_AV_SINK_MEDIA_CFG_EVT
- BTA_AV_MEDIA_DATA_EVT -> BTA_AV_SINK_MEDIA_DATA_EVT
- bta_av_stream_data_cback() -> bta_av_sink_data_cback()
- bte_av_media_callback() -> bte_av_sink_media_callback()
- tBTA_AV_CODEC -> tA2D_CODEC
- btif_a2dp_get_track_frequency() -> A2D_sbc_get_track_frequency()
- btif_a2dp_get_track_channel_count() -> A2D_sbc_get_track_channel_count()
- dump_codec_info() -> A2D_sbc_dump_codec_info()
* Misc. other cleanup:
- log messages cleanup
- normalize usage of "+=" in Android.mk files
Change-Id: Ida1528fb5d75cc322533f921daefb65be44562f1
Myles Watson [Tue, 23 Aug 2016 01:10:54 +0000 (01:10 +0000)]
test_vendor: Allow includes from bt_hci_defs
am:
a11e1c1b71
Change-Id: Ie3494281cda35263f0b0a259eef045541aba3585
Pavlin Radoslavov [Tue, 23 Aug 2016 01:10:53 +0000 (01:10 +0000)]
Removed BTA_AV_INCLUDED conditional guard which is always true
am:
bde45bd653
Change-Id: I3e3775b77c304fa5d440fc841bb6c76efbe3ef89
Myles Watson [Mon, 13 Jun 2016 19:46:38 +0000 (12:46 -0700)]
test_vendor: Allow includes from bt_hci_defs
Avoid duplicating header files for BT constants.
Update Android.mk to search $(BT_DIR)/include and
$(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR)
Change-Id: I1403724c1cf9cda8156a5b65cf55da8178bd910f
Signed-off-by: Myles Watson <mylesgw@google.com>
Pavlin Radoslavov [Mon, 22 Aug 2016 21:49:11 +0000 (14:49 -0700)]
Removed BTA_AV_INCLUDED conditional guard which is always true
Change-Id: Idf7063359600b30c007fbde89dde55ef987c0368
Pavlin Radoslavov [Mon, 22 Aug 2016 19:42:31 +0000 (19:42 +0000)]
Merge "Removed unused code related to Audio, A2DP Sink and Video"
am:
e80e75b4a5
Change-Id: I877e15663150975a102adf692e68e1d27cfc56b8
Treehugger Robot [Mon, 22 Aug 2016 19:36:45 +0000 (19:36 +0000)]
Merge "Removed unused code related to Audio, A2DP Sink and Video"
Pavlin Radoslavov [Mon, 22 Aug 2016 19:30:29 +0000 (19:30 +0000)]
Expose function audio_a2dp_hw_dump_ctrl_event()
am:
febb1515f9
Change-Id: Ifbaade2d4edb6792e328dc37ae21bd0ac5f24560
Pavlin Radoslavov [Fri, 19 Aug 2016 22:04:18 +0000 (15:04 -0700)]
Expose function audio_a2dp_hw_dump_ctrl_event()
Renamed function dump_a2dp_ctrl_event() to
audio_a2dp_hw_dump_ctrl_event() and expose it, so it can be used
by outside code to print events.
Change-Id: Ibd9d3171c7d5256f80101ecc1563b472b7f5e92d
Pavlin Radoslavov [Sat, 20 Aug 2016 00:46:19 +0000 (17:46 -0700)]
Removed unused code related to Audio, A2DP Sink and Video
* Function BTA_AvEnable_Sink() - never used
- Event BTA_AV_API_SINK_ENABLE_EVT
- Processing function bta_av_api_sink_enable()
- AVDT_SINK_Activate() and AVDT_SINK_Deactivate() : not used anymore
* A2DP SINK related functions that are only declared:
- btif_queue_focus_request()
- audio_focus_status()
* Audio-related function that is never used:
- bta_av_sbc_cfg_for_cap()
* Video-related functions that are only declared:
- bta_av_co_video_src_data_path()
- bta_av_co_video_setconfig()
- bta_av_co_video_open()
- bta_av_co_video_close()
- bta_av_co_video_start()
- bta_av_co_video_report_conn()
- bta_av_co_video_report_rr()
- bta_av_co_video_delay()
- bta_av_co_video_disc_res()
- bta_av_co_video_getconfig()
- bta_av_co_video_stop()
Change-Id: I0c0c80578ab2675d2fe23dea3f11b2a0d82283f0
Ajay Panicker [Sat, 20 Aug 2016 03:00:12 +0000 (03:00 +0000)]
Merge "Implement the AVRCP "continue" and "abort continue" responses"
am:
d3e8a45884
Change-Id: I0c8c22beb6c899cf97ccd87744c8fb27964d0f32
Treehugger Robot [Sat, 20 Aug 2016 02:54:13 +0000 (02:54 +0000)]
Merge "Implement the AVRCP "continue" and "abort continue" responses"
Pavlin Radoslavov [Sat, 20 Aug 2016 00:57:02 +0000 (00:57 +0000)]
Merge "Added new function time_get_os_boottime_us() and unit tests"
am:
2637d3cd9d
Change-Id: Icb7fbbe31234c26efb21166b3ed91e03b07177fd
Treehugger Robot [Sat, 20 Aug 2016 00:48:38 +0000 (00:48 +0000)]
Merge "Added new function time_get_os_boottime_us() and unit tests"
Pavlin Radoslavov [Sat, 20 Aug 2016 00:14:35 +0000 (00:14 +0000)]
Added new function fixed_queue_flush() and the unit test
am:
3335cf4e87
Change-Id: I69e145c2e2c4afda6ab0c16c5cf3c9e097b8a8e7
Pavlin Radoslavov [Fri, 19 Aug 2016 22:32:30 +0000 (15:32 -0700)]
Added new function fixed_queue_flush() and the unit test
Change-Id: Ic90e3ffdcaea9573b135bd26ef102a1740fb2d3d
Pavlin Radoslavov [Fri, 19 Aug 2016 23:01:18 +0000 (16:01 -0700)]
Added new function time_get_os_boottime_us() and unit tests
Also, re-implement existing function time_get_os_boottime_ms()
by using the new function time_get_os_boottime_us()
Change-Id: I5c6ba3d04b04c96e0a415b2be1050ef05cb04585
Myles Watson [Fri, 19 Aug 2016 22:29:24 +0000 (22:29 +0000)]
Add a socket unit test for the async_manager
am:
d4f80ae7ca
Change-Id: I646c3271fc61d656908c5c75d609e7bd2b7c3265
Myles Watson [Fri, 19 Aug 2016 15:22:42 +0000 (15:22 +0000)]
Add a socket unit test for the async_manager
This reverts commit
10986700c302f79376894ebef9f2ec92a65b8b08.
Which reverted commit
1387d4330da52034af67d1dbc61b870e8f89c820.
Some minor style changes as well.
Change-Id: I83ea40b4cf96adfa58c24d0cd9109ed9974519f1
Ajay Panicker [Tue, 16 Aug 2016 20:02:40 +0000 (13:02 -0700)]
Implement the AVRCP "continue" and "abort continue" responses
Test: TestTracker/58842/5473
Bug:
30571638
Change-Id: I3bb1a0171e220b6e59b6b739259f98519a31aa27
(cherry picked from commit
3282d12818a0e660a5f3f4295bac55aa8e8d27b4)
JivakDhadse [Thu, 18 Aug 2016 21:38:47 +0000 (21:38 +0000)]
Revert "DO NOT MERGE Proper construction of AVDTP general reject message"
am:
b8b761e722 -s ours
Change-Id: Ieae60a1a48dac361e5efb9acfd9f549d620ece57
JivakDhadse [Fri, 7 Aug 2015 13:28:38 +0000 (18:58 +0530)]
Revert "DO NOT MERGE Proper construction of AVDTP general reject message"
This reverts commit
2ed10d442266eade44be121cd24fd473c85007d0.
Original change needs to be reverted to align with Errata
ESR04 where "Section 8.17, General Reject Page 71" of adopted
AvDTP Spec is changed to have "Invalid Signal Identifier"
in first 6 bits of Octet 1.
This change helps passing PTS case TP/SIG/SMG/ESR04/BI-28-C
Bug:
27852645
Change-Id: I9deba6821284f0cb1423d543550786cc76a61a33
(cherry picked from commit
825cd49864f7338be8b33f901ddf3be8e1bab7c1)
Jorge E. Moreira [Thu, 18 Aug 2016 19:40:37 +0000 (19:40 +0000)]
Added cancelling for fd watching on async manager
am:
b2bbe93c1b
Change-Id: I621620b800f0bec0df0ec0b07bc4beb384482de3
Jorge E. Moreira [Tue, 16 Aug 2016 18:55:27 +0000 (11:55 -0700)]
Added cancelling for fd watching on async manager
Change-Id: I4107b3b50345f81833c47c85c4a322a582973bb2
Myles Watson [Thu, 18 Aug 2016 16:28:54 +0000 (16:28 +0000)]
Revert "Added unit test for async_manager with sockets"
am:
10986700c3
Change-Id: I3b8264f5b4124dda166cafdce61ac0c941e18710
Myles Watson [Thu, 18 Aug 2016 16:22:01 +0000 (16:22 +0000)]
Revert "Added unit test for async_manager with sockets"
This reverts commit
1387d4330da52034af67d1dbc61b870e8f89c820.
Change-Id: I4af4e0d5ac5a108f3de44d186db97592a70c729e
Jorge E. Moreira [Thu, 18 Aug 2016 15:37:51 +0000 (15:37 +0000)]
Added unit test for async_manager with sockets
am:
1387d4330d
Change-Id: I4ccdc7e14b81e2bdc7862764b49f4d2dd4044d04
Jorge E. Moreira [Wed, 17 Aug 2016 20:53:00 +0000 (13:53 -0700)]
Added unit test for async_manager with sockets
Change-Id: I8d31f766722e4b4a6c6fe00e30a957ac43176cf1
Chih-Hung Hsieh [Thu, 18 Aug 2016 01:57:01 +0000 (01:57 +0000)]
Fix clang-tidy warnings in bt.
am:
5dc0d15e78
Change-Id: I217b7399aa9294ca3fe47bc862aebe83343037c0
Chih-Hung Hsieh [Wed, 17 Aug 2016 21:12:51 +0000 (14:12 -0700)]
Fix clang-tidy warnings in bt.
* Add explicit keyword to conversion constructors,
or add NOLINT to implicit conversion constructors.
Bug:
28341362
* Use const reference type for read-only parameters,
or add NOLINT to keep same callback function signature.
Bug:
30407689
* Use const reference type for loop index variables to avoid unnecessary copy.
Bug:
30413223
* Use const reference type to avoid unnecessary copy.
Bug:
30413862
Test: build with WITH_TIDY=1
Change-Id: I8237d332f32d7be09ab72a8de82160fdb776dcd1
Jorge E. Moreira [Thu, 18 Aug 2016 00:12:14 +0000 (00:12 +0000)]
Fix incorrect fd used for select() call in vendor lib async_manager
am:
7225e499e8
Change-Id: Icfc520b04919ab57b7a7a3b36435e05842a62f39
Jorge E. Moreira [Wed, 17 Aug 2016 20:59:15 +0000 (13:59 -0700)]
Fix incorrect fd used for select() call in vendor lib async_manager
Change-Id: Iabb8389ee6fcef0f9c6a17838d6a3a9a517befc6
Jakub Pawlowski [Wed, 17 Aug 2016 16:11:50 +0000 (16:11 +0000)]
Make gatt_attr use opportunistic connection
am:
109891d07f
Change-Id: I432143bb5149619e2ec223b84e03f3280f1182c1
Jakub Pawlowski [Mon, 18 Jul 2016 16:06:49 +0000 (09:06 -0700)]
Make gatt_attr use opportunistic connection
This patch creates new connection mode - opportunistic connection. When
such connection is made, no call to gatt_update_app_hold_link_status
will be made when it's started.
This means that connecting and disconnecting in this mode won't trigger
disconnect timer. When other, app creates regular connection and then
disconnects, the physical connection might get disconnected.
Opportunistic connection is used only for code setting CCC right now.
Bug:
30186455
Change-Id: Ia5be7682b6c3dcb4993060f818dee603aef3e19e
TreeHugger Robot [Wed, 17 Aug 2016 04:15:14 +0000 (04:15 +0000)]
Merge "Synchronize the code with AOSP" into stage-aosp-master
Pavlin Radoslavov [Wed, 17 Aug 2016 04:05:32 +0000 (04:05 +0000)]
Synchronize the code with the internal tree
am:
55f82cd30f
Change-Id: I0e7041e39efad3e51638091e1f9e9b24b8a4176c
Marie Janssen [Fri, 4 Mar 2016 01:50:26 +0000 (17:50 -0800)]
Randomize allocation canary
A static allocation canary can be susceptible to buffer overflow
exploit code bypassing, so this randomizes it on every run.
Bug:
27411268
Change-Id: I81b06f89951a012c08d846042653ec957f3e9127
(cherry picked from commit
7c054350fb7da9da1fdb86e7f7b9a801cf1c39e4)
Pavlin Radoslavov [Wed, 17 Aug 2016 02:42:16 +0000 (19:42 -0700)]
Synchronize the code with the internal tree
Spacing, line split, etc.
Change-Id: I781e771e93b104bbc044d1646106c19d8af55e7b
Pavlin Radoslavov [Wed, 17 Aug 2016 02:35:51 +0000 (19:35 -0700)]
Synchronize the code with AOSP
Minor edits - spacing, etc.
Change-Id: I172d64585e82c23789fbad17e7366bbc55a9e50d
Glenn Kasten [Wed, 17 Aug 2016 01:50:24 +0000 (01:50 +0000)]
Merge "Fix a typo in pre-compiler error message"
am:
7cc80100e1
Change-Id: Ieccd17672a872e3d60bb48cf1b3a34c8cbe09ae9
Treehugger Robot [Wed, 17 Aug 2016 01:44:34 +0000 (01:44 +0000)]
Merge "Fix a typo in pre-compiler error message"
Andre Eisenbach [Wed, 17 Aug 2016 01:14:22 +0000 (01:14 +0000)]
Add Subaru and Nissan car kits to auto pair blacklist
am:
ed272ff2f7
Change-Id: I1b39608a553f5cef0748c9b6464fa92cc1eee823
Glenn Kasten [Tue, 8 Mar 2016 20:11:38 +0000 (12:11 -0800)]
Fix a typo in pre-compiler error message
Change-Id: Ia584c748ea065739e0f6df1ea8a86df517a257af
Sathya Kumar [Tue, 16 Aug 2016 23:58:21 +0000 (23:58 +0000)]
Disable 3Mbps packets for AVDT ACL links
am:
f527ce28b4 -s ours
Change-Id: I2b464cbf192b41edfd904ae4eddd7159a64213e7
Andre Eisenbach [Mon, 27 Jun 2016 22:49:53 +0000 (15:49 -0700)]
Add Subaru and Nissan car kits to auto pair blacklist
Bug:
29157087
Change-Id: If227963b939a9b0ed55e6d900364c71932d3cfe8
(cherry picked from commit
d13870072e61e468e6cd8f3e007a1647f7001a14)
Sathya Kumar [Thu, 7 Jan 2016 23:26:05 +0000 (17:26 -0600)]
Disable 3Mbps packets for AVDT ACL links
Change-Id: I4b1b52ec8aeaf5eab0672231889e0ea6f23aa852
(cherry picked from commit
26bb30842b6c64821c2a6c4a515f290140017105)
Merged-In: I4b1b52ec8aeaf5eab0672231889e0ea6f23aa852
Sathya Kumar [Thu, 7 Jan 2016 23:26:05 +0000 (17:26 -0600)]
resolve merge conflicts of
37119da to stage-aosp-master
Change-Id: I4b1b52ec8aeaf5eab0672231889e0ea6f23aa852
(cherry picked from commit
26bb30842b6c64821c2a6c4a515f290140017105)
Pavlin Radoslavov [Tue, 16 Aug 2016 17:44:36 +0000 (10:44 -0700)]
Use C++ style std::string instead of C-style string
Change-Id: I323187bca7555adada2a8a5cf2c25e30592040b1
Sridhar Vashist [Tue, 16 Aug 2016 10:21:38 +0000 (10:21 +0000)]
Merge "Make default SBC bitrate configurable by device."
am:
57e911ea25
Change-Id: I3233e531e724bb1fa27afc73bc78c5fdf3ad5117
Treehugger Robot [Tue, 16 Aug 2016 10:15:01 +0000 (10:15 +0000)]
Merge "Make default SBC bitrate configurable by device."
Sridhar Vashist [Tue, 16 Aug 2016 09:44:06 +0000 (09:44 +0000)]
Merge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE."
am:
21a7e48c0f
Change-Id: If6b31a75dfd04c69e620402e81df741c348f714c
Treehugger Robot [Tue, 16 Aug 2016 09:37:37 +0000 (09:37 +0000)]
Merge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE."
Sridhar Vashist [Wed, 14 Oct 2015 22:47:02 +0000 (17:47 -0500)]
Make default SBC bitrate configurable by device.
Configurable default SBC bitrate so that audio quality can be maintained
for sampling rates other than 44.1kHz
Change-Id: Ia4197c0a500088cfa48a8ba821e9738a16c3fc6e
Signed-off-by: Sridhar Vashist <svashist@motorola.com>
(cherry picked from commit
5f308397b7fe8a8da3f88b0f8910c3863ed1ec0b)
ugo_yu [Tue, 16 Aug 2016 08:30:32 +0000 (08:30 +0000)]
Merge "GATT: Deregister notification when a GATT connection is closed"
am:
bb75465676
Change-Id: Ia3bd8ef88282634a6d142593f9edb8ba41c65ac5
Treehugger Robot [Tue, 16 Aug 2016 08:22:56 +0000 (08:22 +0000)]
Merge "GATT: Deregister notification when a GATT connection is closed"
Sridhar Vashist [Fri, 7 Aug 2015 00:40:24 +0000 (19:40 -0500)]
Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE.
There appear to be race cases where the peer sends a START before
we reconfigure the stream. Avoid btif_av state from getting
mismatched by always sending out the SUSPEND_CFM during RECONFIGURE.
Change-Id: I2034cd111466f792233cedb60a3a0df11d055962
Signed-off-by: Sridhar Vashist <svashist@motorola.com>
(cherry picked from commit
8b1c7af03a2a8eedd1efd2eddca3ecd4b61bfd95)
Marie Janssen [Tue, 16 Aug 2016 07:40:58 +0000 (07:40 +0000)]
Merge "Check size of pin before replying"
am:
545ac907dd
Change-Id: Ibbf6e58b4297871899baa85b9bfa3510eac402b1
Treehugger Robot [Tue, 16 Aug 2016 07:35:18 +0000 (07:35 +0000)]
Merge "Check size of pin before replying"
Andy Hung [Tue, 16 Aug 2016 07:24:56 +0000 (07:24 +0000)]
audio_a2dp_hw: Always update frame counter in out_write
am:
cd85170ab8
Change-Id: Ic87913c0b7d8ed7d3d8dceb4a292517706e1724b
ugo_yu [Fri, 3 Jun 2016 10:04:24 +0000 (18:04 +0800)]
GATT: Deregister notification when a GATT connection is closed
Precondition:
1. Pair with specific HOGP mouse.
Steps:
1. Pair with HOGP mouse (iBuffalo BSMBB09DS)
2. Unpair the mouse.
3. Pair the mouse again.
Failure:
Pairing is successful, but the mouse won't connect.
Root Cause:
Some HOGP mice send notifications before the stack writes the
client characteristic configuration descriptor.
The Bluetooth stack doesn't deregister these notifiactions
when disconnecting.
Fix:
Deregister notifications when the GATT connection closes.
Fixes:
29111689
Change-Id: I520faeaa5fc396381cb248d3a2c49efbffa12261
(cherry picked from commit
7592bcfe7a0be9dc4ffdfc3f29bf68fd68950418)
Marie Janssen [Wed, 9 Mar 2016 23:31:48 +0000 (15:31 -0800)]
Check size of pin before replying
If a malicious client set a pin that was too long it would overflow
the pin code memory.
Bug:
27411268
Change-Id: I9197ac6fdaa92a4799dacb6364e04671a39450cc
(cherry picked from commit
7120b9f35f1c3d8b4f115bc9bb39ab39443886e1)
Andy Hung [Thu, 28 Jul 2016 17:45:54 +0000 (10:45 -0700)]
audio_a2dp_hw: Always update frame counter in out_write
Required now that we always return success.
Bug:
30025777
Change-Id: I7db51321672c128039545cc0fb604c615f169bc3
(cherry picked from commit
f4a37b255d1d6fa4cf7cefe2aeb1c3f4fdf33f3c)
Andre Eisenbach [Tue, 16 Aug 2016 05:46:52 +0000 (05:46 +0000)]
Remove SBC frame scrambling
am:
7fcea70080
Change-Id: If59587ff211e5ce378e4258aabcb7a32774553a9
Andre Eisenbach [Thu, 23 Jun 2016 22:25:44 +0000 (15:25 -0700)]
Remove SBC frame scrambling
Bug:
29601962
Change-Id: I30ce09f1c7550a1be9fd1c8ed70745f9aa0cdb44
(cherry picked from commit
470aee234664fd75094c16dd2c70313ee28354c1)
Jacky Cheung [Tue, 16 Aug 2016 03:40:18 +0000 (03:40 +0000)]
Merge "New status code for two SMP authorization failures"
am:
b29732059e
Change-Id: I8d05dde66952f263ebfcc81cbc38b0f27675efd7
Andre Eisenbach [Tue, 16 Aug 2016 03:40:15 +0000 (03:40 +0000)]
HID: Check for EINTR in uhid_event() and fix return value evaluation
am:
acb093ada7
Change-Id: I4c7269a3aee069ca725eec0faa885100171e198d
Treehugger Robot [Tue, 16 Aug 2016 03:37:09 +0000 (03:37 +0000)]
Merge "New status code for two SMP authorization failures"
Jacky Cheung [Wed, 6 Jul 2016 22:11:30 +0000 (15:11 -0700)]
New status code for two SMP authorization failures
On BTA_DM_AUTH_SMP_UNKNOWN_ERR and BTA_DM_AUTH_SMP_CONN_TOUT, bond state
status will be notified as BT_STATUS_AUTH_FAILURE. This is observed during
the pairing flow with iOS devices.
Plus minor cleanup on SMP errors and fail reasons.
Bug:
29779689
Change-Id: Ia32fe6bb84b07272d5159409f65217a06a2e5f8e
(cherry picked from commit
6984b19d95736d7205fc6302a21e8be564617287)
Pavlin Radoslavov [Tue, 16 Aug 2016 00:43:30 +0000 (17:43 -0700)]
Removed bogus leftover code that wasn't auto-merged properly
Change-Id: I41c2869ae32f08bc170cc222f036e0bc207b81f9
Jorge E. Moreira [Mon, 15 Aug 2016 21:21:25 +0000 (21:21 +0000)]
Refactor vendor library to use async manager class
am:
0b32c8d8c1
Change-Id: Ifeb58d21c5343f7fe42b6bce87cb03b2063003ee
Jorge E. Moreira [Mon, 15 Aug 2016 21:21:23 +0000 (21:21 +0000)]
Added the async manager
am:
08c214154d
Change-Id: I583d351023846be861018cd67f5410a50d98a12a
Andre Eisenbach [Mon, 30 May 2016 19:00:46 +0000 (12:00 -0700)]
HID: Check for EINTR in uhid_event() and fix return value evaluation
uhid_event() returns 0 in the normal case. Commit
3a2c2d61
results in the polling thread to be exited.
Bug:
28942565
Change-Id: Id0aff2958bc7c2704ba340aa0ff7848afb8dcf80
(cherry picked from commit
32d66694e9f782a0e9dfa423015284a573f8975c)
Jorge E. Moreira [Mon, 8 Aug 2016 18:39:52 +0000 (11:39 -0700)]
Refactor vendor library to use async manager class
Homogenizes the use of lambdas/binds (uses c++ lambdas only)
Uses STL's time library implementation (std::chrono)
Change-Id: I6194b26c0a7fabffddf96acb5c2379ff52026a84
Jorge E. Moreira [Mon, 15 Aug 2016 21:13:38 +0000 (21:13 +0000)]
Added missing #include directives
am:
65ee728284
Change-Id: I5b293b7ff4665312efdf1bcc00a6f2f5058d2670
Jorge E. Moreira [Mon, 8 Aug 2016 18:39:52 +0000 (11:39 -0700)]
Added the async manager
Change-Id: I968fee42fd610e33e13bf358f54bec1fe7af4a7d
Jorge E. Moreira [Tue, 9 Aug 2016 22:21:01 +0000 (15:21 -0700)]
Added missing #include directives
Change-Id: Ia26cd6775699c65a75d94003c09730926835f7a3
Jorge E. Moreira [Mon, 15 Aug 2016 20:51:50 +0000 (20:51 +0000)]
Replace calls to std::bind by lambda expressions
am:
97980c25a1
Change-Id: Iad98f599d6bd802c42b583c6bb5d8e75da568839
Jorge E. Moreira [Mon, 15 Aug 2016 19:17:44 +0000 (19:17 +0000)]
No longer uses the macro DISALLOW_COPY_AND_ASSIGN
am:
83cf95e0a1
Change-Id: I6bd4c3d3bb9b12ce8a167769ce4be5dbefebe10a
Jorge E. Moreira [Mon, 15 Aug 2016 19:17:41 +0000 (19:17 +0000)]
Using include paths relative to vendor library dir
am:
ea3ede2474
Change-Id: Ic703fda9a8c7d72f6fb563069d1948f190ac7924
Jorge E. Moreira [Fri, 5 Aug 2016 18:07:07 +0000 (11:07 -0700)]
Replace calls to std::bind by lambda expressions
Change-Id: I5fbe6ae6d5172e87428322084276e593a67fd7d1
Jorge E. Moreira [Thu, 4 Aug 2016 23:55:31 +0000 (16:55 -0700)]
No longer uses the macro DISALLOW_COPY_AND_ASSIGN
Change-Id: I3403cdfa38fabf56ffe0854064eeb0ae38eb5a4a
Jorge E. Moreira [Thu, 4 Aug 2016 23:46:45 +0000 (16:46 -0700)]
Using include paths relative to vendor library dir
Change-Id: I6b5dfa4098cdf2eda21d3fae60729b765532c2f9
Andy Hung [Mon, 15 Aug 2016 18:20:11 +0000 (18:20 +0000)]
Merge "Improve BT HAL write response to BT server reads"
am:
f65e83e5b1
Change-Id: Ib48a998e19b3eada7d19897b81626f60309062b3
Treehugger Robot [Mon, 15 Aug 2016 18:15:31 +0000 (18:15 +0000)]
Merge "Improve BT HAL write response to BT server reads"
Pavlin Radoslavov [Mon, 15 Aug 2016 17:59:38 +0000 (17:59 +0000)]
Separate the Alarm unit tests from testing the Wakelocks
am:
223cecf8b6
Change-Id: Iceb0a3e4d2f776456cad88a5276dbd9516baf175
Andy Hung [Wed, 15 Jun 2016 02:58:58 +0000 (19:58 -0700)]
Improve BT HAL write response to BT server reads
By polling, we ensure the socket buffer is nearly always full,
as blocking socket writes may not wake in time to avoid underflow.
Bug:
28286313
Change-Id: I056768dbd860993c41d44c33a4846d62c50db933
(cherry picked from commit
5952e40bef1afb310cd3bba7e673163d7e32d62c)
Pavlin Radoslavov [Mon, 8 Aug 2016 18:18:47 +0000 (11:18 -0700)]
Separate the Alarm unit tests from testing the Wakelocks
* Simplify the AlarmTestHarnless unit test setup for Wakelocks.
Now we use wakelock_set_os_callouts() to setup local unit tests and
to keep local state whether the wakelock is acquired.
Also, removed unused timer-related setup inside AlarmTestHarnless.
* Add explicit Wakelock unit tests
Change-Id: I08bd8d457fd48ec45a8a591bd69cb08dbaf5ee7a
Jakub Pawlowski [Thu, 11 Aug 2016 23:06:57 +0000 (23:06 +0000)]
Add LE Secure Connection data parsing (3/4)
am:
bd60854e49
Change-Id: Ia33a911e973fe22b72a4bf4f3ce89d20b9b71fea
Jakub Pawlowski [Thu, 28 Jul 2016 12:58:35 +0000 (05:58 -0700)]
Add LE Secure Connection data parsing (3/4)
Bug:
30460956
Change-Id: I216142090fe99b25ef7697fceceb278b761a182b
Satomi [Tue, 9 Aug 2016 20:23:51 +0000 (20:23 +0000)]
Revert "Register for Service Changed notifications for untrusted devices"
am:
42657c2f23
Change-Id: I01ff859d5158904695965a0038b252fc98c9096d