OSDN Git Service
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: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: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
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
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: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: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""
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: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
Joseph Pirozzo [Mon, 10 Oct 2016 21:28:41 +0000 (21:28 +0000)]
Merge "L2CAP: Ensure handle is not null before attempting to close a socket"
am:
171c14eae0
Change-Id: I67fb6fa41c43625d428876bf5e54a8dae0356619
Jakub Pawlowski [Mon, 10 Oct 2016 21:27:36 +0000 (21:27 +0000)]
Remove return value from btsnd_hcic_* functions
am:
763abdfe79
Change-Id: I4248cbfafdc297d8053b12d26f1791d00dbf359e
Jakub Pawlowski [Mon, 10 Oct 2016 21:27:34 +0000 (21:27 +0000)]
Ignore return value of btsnd_hcic_* functions
am:
b6ab9b3af6
Change-Id: Id0f22cafe797ddd5934d5e0685a65123c6a4f089
Treehugger Robot [Mon, 10 Oct 2016 20:19:29 +0000 (20:19 +0000)]
Merge "L2CAP: Ensure handle is not null before attempting to close a socket"
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
Jakub Pawlowski [Mon, 10 Oct 2016 18:39:39 +0000 (11:39 -0700)]
Remove return value from btsnd_hcic_* functions
btsnd_hcic_* functions are always returning true, so this return value
is not really useful.
Test: unit tests pass
Change-Id: I06ced65392d180ceed565e45b7831de6aede283c
Jakub Pawlowski [Mon, 10 Oct 2016 16:35:13 +0000 (09:35 -0700)]
Ignore return value of btsnd_hcic_* functions
btsnd_hcic_* functions return only true. This patch makes sure that no
logic is waiting for "false" value.
Few methods, that had their return value dependent on result of
btsnd_hcic_* were made void.
Test: unit tests pass
Change-Id: I43cff62f461ff35f4bd84e5338f1a587b6a05c58
Joseph Pirozzo [Mon, 10 Oct 2016 14:05:51 +0000 (07:05 -0700)]
L2CAP: Ensure handle is not null before attempting to close a socket
Bug:
32054308
Test: manual, UPF 55
Change-Id: Ib89f7557fa390d60691afe8399a768e8127e52cb
(cherry picked from commit
a1fa1bb0d638d5f444bf959fb839e824d69de31d)
Gurpreet Ghai [Fri, 7 Oct 2016 20:02:49 +0000 (20:02 +0000)]
Merge "Add null check to avoid exception after L2CAP psm assigned" am:
ee85d35220
am:
defed78c2a
Change-Id: I6602872885f941baf842aba7de05ff602c33e7ba
Ben YoungTae Kim [Fri, 7 Oct 2016 20:02:39 +0000 (20:02 +0000)]
HID: Fix to handle UHID_OUTPUT_EV command from UHID driver am:
960b9c391d
am:
9dfee34e3f
Change-Id: Ibd3acdfdf31b7fb31dc07288f4d8bd46895c4cba
Gurpreet Ghai [Fri, 7 Oct 2016 19:58:52 +0000 (19:58 +0000)]
Merge "Add null check to avoid exception after L2CAP psm assigned"
am:
ee85d35220
Change-Id: Ie16d5d2af12291c02a47e6ce39fc002503063b93
Ben YoungTae Kim [Fri, 7 Oct 2016 19:58:43 +0000 (19:58 +0000)]
HID: Fix to handle UHID_OUTPUT_EV command from UHID driver
am:
960b9c391d
Change-Id: I47e7a4edfdf075223b8eb3115a31ff0a5541aa7d
Treehugger Robot [Fri, 7 Oct 2016 19:51:54 +0000 (19:51 +0000)]
Merge "Add null check to avoid exception after L2CAP psm assigned"
Ben YoungTae Kim [Wed, 10 Aug 2016 20:31:23 +0000 (13:31 -0700)]
HID: Fix to handle UHID_OUTPUT_EV command from UHID driver
Incorrect size check for UHID_OUTPUT_EV for incoming data from
UHID driver of kernel was leading to exiting of poll thread.
This was causing IOT issues with Apple Magic Mouse that require
output report to be sent for proper functioning of scroll functionality.
Bug:
28942565
Change-Id: I2eaba1f70b7cd51fb21933031d439543eb141fd2
Gurpreet Ghai [Wed, 3 Feb 2016 09:31:41 +0000 (15:01 +0530)]
Add null check to avoid exception after L2CAP psm assigned
Use case: BT will get crash in SNS testing.
steps: SNS testing BT ON/OFF.
Failure: Crash is observed.
Root Cause: If the number of supported services increased,
larger service record array is required. Smaller array is
resulting in out of record error causing L2CAP deregister.
Fix: Check added to avoid null pointer exception if null
is returned while fetching sock from id. Also cleanup of
SDP and security records done during BT turning Off.
Change-Id: I2e77127262119cabf2c372f894427dcdf3350e80
Jakub Pawlowski [Thu, 6 Oct 2016 23:18:58 +0000 (23:18 +0000)]
Refactor advertising data types am:
9eaf776867
am:
8b081eb046
Change-Id: Ib537646a851d0035a98d2ee313e2c41eded4054c
Jakub Pawlowski [Thu, 6 Oct 2016 23:15:45 +0000 (23:15 +0000)]
Refactor advertising data types
am:
9eaf776867
Change-Id: I164b968032be28ea1ac5e1dceeb614d1b1945826
Jakub Pawlowski [Wed, 5 Oct 2016 02:30:09 +0000 (19:30 -0700)]
Refactor advertising data types
Currently we have some unnecessary complicated code for handling
advertising data. Get rid of it.
Bug:
30622771
Test: Tests making sure flags and tx power are filled are added
Change-Id: I807cdf11577c357c116c54cab50bbf3261e1ee16
Pavlin Radoslavov [Wed, 5 Oct 2016 23:49:21 +0000 (23:49 +0000)]
Use the correct API to check whether a codec is valid am:
a0db321d98
am:
70340b2e5a
Change-Id: I11d33eb780421159ea075d2258cf6f3bd54cf305
Pavlin Radoslavov [Wed, 5 Oct 2016 23:46:51 +0000 (23:46 +0000)]
Use the correct API to check whether a codec is valid
am:
a0db321d98
Change-Id: I1ffc55d6a5d79aa62c191249a590a9bc2d0209bb
Pavlin Radoslavov [Wed, 5 Oct 2016 21:25:08 +0000 (14:25 -0700)]
Use the correct API to check whether a codec is valid
Use the (new) A2D_IsPeerSinkCodecValid() API call as appropriate
to check whether the codec information of a Sink peer is valid.
Previously, A2D_IsSourceCodecSupported() was used, and that didn't
match the original code (before the refactoring).
A2D_IsSourceCodecSupported() has extra checks, including min/max bitpool
oundaries, and those shouldn't be used for this initial check - the
bitpool boundaries can be adjusted later.
Similarly, use the new A2D_IsPeerSourceCodecValid() API call instead of
A2D_IsSinkCodecSupported().
Also:
* Replaced A2D_IsValidCodec() with
A2D_IsSourceCodecValid(), A2D_IsSinkCodecValid()
A2D_IsPeerSourceCodecValid(), A2D_IsPeerSinkCodecValid()
and added the appropriate unit tests.
* Added extra debug messages to help identify similar issues in the future
Bug:
31749230
Test: manual test with a carkit, and unit tests
Change-Id: Iafaeb82744df9758e686194c91624992a0c55bdf
Jakub Pawlowski [Wed, 5 Oct 2016 18:06:08 +0000 (18:06 +0000)]
Remove unnecessary checks of BTM_MAX_LOC_BD_NAME_LEN am:
be43ee7658
am:
4ca45cee60
Change-Id: Ie93d9f49eb2c96cdecb89ab7b92b49b74a154e65
Jakub Pawlowski [Wed, 5 Oct 2016 18:03:37 +0000 (18:03 +0000)]
Remove unnecessary checks of BTM_MAX_LOC_BD_NAME_LEN
am:
be43ee7658
Change-Id: I1dbcfc9e49433b83426ee13df9bdbfda9a5deab9
Jakub Pawlowski [Wed, 5 Oct 2016 17:25:57 +0000 (17:25 +0000)]
Make Bluetooth LE multi-advertising testable am:
e47b769e71
am:
7e6427804e
Change-Id: I6815329400aca2471360f76eafb7a13357906e2b
Jakub Pawlowski [Wed, 5 Oct 2016 17:22:52 +0000 (17:22 +0000)]
Make Bluetooth LE multi-advertising testable
am:
e47b769e71
Change-Id: I9dfc10c8849e1ac63494dbc9295d6e354127ec40
Jakub Pawlowski [Tue, 4 Oct 2016 23:47:01 +0000 (16:47 -0700)]
Remove unnecessary checks of BTM_MAX_LOC_BD_NAME_LEN
Change-Id: I6e68f80d0d97081a4fc3879e6c11342923cfef7b
Jakub Pawlowski [Wed, 28 Sep 2016 14:36:54 +0000 (07:36 -0700)]
Make Bluetooth LE multi-advertising testable
This patch turns the code that manages LE multi-advertising into the
BleAdvertisingManager class. All HCI calls made by this code were
abstracted into BleAdvertiserHciInterface.
Thanks to those changes, we can mock BleAdvertiserHciInterface and test
the advertising manager.
The BleAdvertisingManagerTest, still has some dependencies on other
code from the "stack" module. These have to be implemented on top of the
test file. In the future, this dependencies should be replaced by mockable
classes.
Test: Tests covering the change are added in this patch.
Bug:
30622771
Change-Id: I4a363678815c235ee01255f462db2a671ef89610
Myles Watson [Wed, 5 Oct 2016 04:06:03 +0000 (04:06 +0000)]
vendor_lib: Apply clang-format with the new config am:
015834df15
am:
d4c8851090
Change-Id: I946747b17cd5cc06a4c4fe5736f18c6a7c824c93
Myles Watson [Wed, 5 Oct 2016 04:03:33 +0000 (04:03 +0000)]
vendor_lib: Apply clang-format with the new config
am:
015834df15
Change-Id: I23daee752536e6758e9d06714d04edcaa68b9f9b
Myles Watson [Fri, 30 Sep 2016 15:45:15 +0000 (08:45 -0700)]
vendor_lib: Apply clang-format with the new config
cd vendor_libs/test_vendor_lib/
clang-format ../linux/bt_vendor_linux.c -style=file -i
clang-format include/* test/* src/* -style=file -i
Update the style guide since clang-format help uses the
-style=file option.
Test: mm -j32
Change-Id: I166adfb2bb9a87fefa1242c91e5f180011caa2ad
Mark Salyzyn [Tue, 4 Oct 2016 19:44:47 +0000 (19:44 +0000)]
bt: replace cutils/log.h with android/log.h am:
5201f95102
am:
be4bc71f9f
Change-Id: Ifa91e4b14d98dc4dd22faf27b4b5d8dd4df1b2da
Mark Salyzyn [Tue, 4 Oct 2016 19:41:47 +0000 (19:41 +0000)]
bt: replace cutils/log.h with android/log.h
am:
5201f95102
Change-Id: Ieefd12664db41ec7e8a1c08088a3463a58a39d86
Mark Salyzyn [Wed, 28 Sep 2016 22:31:49 +0000 (15:31 -0700)]
bt: replace cutils/log.h with android/log.h
Test: compile
Bug:
26552300
Bug:
31289077
Change-Id: I8fb392150441ca5b6bc43dc43a10a3009e22202b
Jakub Pawlowski [Tue, 4 Oct 2016 00:44:15 +0000 (00:44 +0000)]
Merge "Fix bad GATT client state machine state after successfull cache load" am:
69b916046d
am:
0776cdf3e6
Change-Id: I2094e041dc9d38c1ceb1ea5a649d62de16a9ae0a
Jakub Pawlowski [Tue, 4 Oct 2016 00:41:45 +0000 (00:41 +0000)]
Merge "Fix bad GATT client state machine state after successfull cache load"
am:
69b916046d
Change-Id: Ib8fedecce74779755c2ebb285db6ca31b8714b68
Jakub Pawlowski [Tue, 4 Oct 2016 00:38:14 +0000 (00:38 +0000)]
Merge "Fix bad GATT client state machine state after successfull cache load"
Mark Salyzyn [Mon, 3 Oct 2016 22:52:21 +0000 (22:52 +0000)]
Replace log/log.h with android/log.h am:
2f0c1fff33
am:
53dc5ba848
Change-Id: I1009dd3e5413e8c84608bc6e473cd4127fbd4f9e
Mark Salyzyn [Mon, 3 Oct 2016 22:48:20 +0000 (22:48 +0000)]
Replace log/log.h with android/log.h
am:
2f0c1fff33
Change-Id: I137539cc1f2cdeda6ceb6f7e4106fb379dc50555
Mark Salyzyn [Thu, 29 Sep 2016 16:16:01 +0000 (09:16 -0700)]
Replace log/log.h with android/log.h
Actually, remove reference, android logging is not used here.
Test: compile
Bug:
26552300
Bug:
31289077
Change-Id: I37731dc37f61c129f3440e5d9ff1d0e71fe193d0
Jakub Pawlowski [Mon, 3 Oct 2016 20:25:01 +0000 (13:25 -0700)]
Fix bad GATT client state machine state after successfull cache load
If the GATT service cache was successfully loaded from a file, the
state must be reset to idle.
Bug:
31175159
Change-Id: I92ebf1bec9d2e7467d7412b41923614ec5a13b6d
Jorge E. Moreira [Mon, 3 Oct 2016 17:31:45 +0000 (17:31 +0000)]
test_vendor: Refactor scheduling of dual_mode_controller event handling am:
3c4f59fc27
am:
81f2249e94
Change-Id: I9e6660f68a78f200d00ccc8f895b59599901138a
Jorge E. Moreira [Mon, 3 Oct 2016 17:28:07 +0000 (17:28 +0000)]
test_vendor: Refactor scheduling of dual_mode_controller event handling
am:
3c4f59fc27
Change-Id: Ia9a9860a9744580349921a5d9cb0ad9771bdefaf
Jorge E. Moreira [Fri, 16 Sep 2016 23:50:41 +0000 (16:50 -0700)]
test_vendor: Refactor scheduling of dual_mode_controller event handling
Moved all controller actions out of read callbacks to task callbacks to
avoid race conditions when modifying internal controller state.
Change-Id: Ie8bb762992755db2dddb6b7bb6a4fe52ab2d0020
Jack He [Fri, 30 Sep 2016 21:55:26 +0000 (21:55 +0000)]
Remove redundant logic from system/bt/bta am:
e143d941d2
am:
b9554aed8a
Change-Id: Id26fd245bb90aeeee658a61adee595d30ef0ba15
Jack He [Fri, 30 Sep 2016 21:51:55 +0000 (21:51 +0000)]
Remove redundant logic from system/bt/bta
am:
e143d941d2
Change-Id: I4fbe813cfa2809efd083cd36d567860fc7fe5ceb
Jack He [Fri, 30 Sep 2016 19:57:44 +0000 (12:57 -0700)]
Remove redundant logic from system/bt/bta
Bug:
31274290
Test: Manual
Change-Id: I5a4bff5e25b08a32709cdc81bac86a641d80f113
Kim Schulz [Fri, 30 Sep 2016 19:49:29 +0000 (19:49 +0000)]
Merge "Do not request remote name from non-connectable dev" am:
49109aefb0
am:
13e05a1959
Change-Id: Id6c15d6012a7a2d6edfbee1e24ef81fba25e93ac
Kim Schulz [Fri, 30 Sep 2016 19:46:29 +0000 (19:46 +0000)]
Merge "Do not request remote name from non-connectable dev"
am:
49109aefb0
Change-Id: Iae4d72d5ed0c452085adf36b0c27daa61c45a8ae
Patrick Tsai [Fri, 30 Sep 2016 19:43:08 +0000 (19:43 +0000)]
Merge "Fix warnings of implicit function declaration in Linux vendor lib" am:
c4c9923724
am:
feaf001c2d
Change-Id: I18d5825d09aba13e37ece6e8b63b5087bd729d08
Treehugger Robot [Fri, 30 Sep 2016 19:40:53 +0000 (19:40 +0000)]
Merge "Do not request remote name from non-connectable dev"
Patrick Tsai [Fri, 30 Sep 2016 19:40:06 +0000 (19:40 +0000)]
Merge "Fix warnings of implicit function declaration in Linux vendor lib"
am:
c4c9923724
Change-Id: I1d4d89be2d72f13e9bd5ae8b4b90856b21e3a0b9
Treehugger Robot [Fri, 30 Sep 2016 19:33:46 +0000 (19:33 +0000)]
Merge "Fix warnings of implicit function declaration in Linux vendor lib"
Sebastien Griffoul [Fri, 30 Sep 2016 19:11:41 +0000 (19:11 +0000)]
Fix NULL pointer crash in send_at_cmd am:
5c8fa2b199
am:
907d1e9cdc
Change-Id: Iccd3eb172e6bdae93aab0dbf7724d5a73beba379
Sebastien Griffoul [Fri, 30 Sep 2016 19:08:42 +0000 (19:08 +0000)]
Fix NULL pointer crash in send_at_cmd
am:
5c8fa2b199
Change-Id: I64b04cbf63438f25e58b700a9af6fe1d51a3905b