OSDN Git Service
Ajay Panicker [Wed, 2 Dec 2015 23:56:29 +0000 (23:56 +0000)]
Synchronize Bluetooth stack init and cleanup am:
c28849aa58
am:
9b35619839
* commit '
9b35619839ab089356411ed9d61921628e808007':
Synchronize Bluetooth stack init and cleanup
Ajay Panicker [Wed, 2 Dec 2015 23:52:59 +0000 (23:52 +0000)]
Synchronize Bluetooth stack init and cleanup
am:
c28849aa58
* commit '
c28849aa58c10a4e57d6cb7e5f6d876cba4f8d99':
Synchronize Bluetooth stack init and cleanup
Andre Eisenbach [Wed, 2 Dec 2015 23:09:17 +0000 (23:09 +0000)]
Compile as 64-bit library; fix includes am:
d3842ed786
am:
bc605b15f1
* commit '
bc605b15f1ba76e74dafeddb0339569c814d4292':
Compile as 64-bit library; fix includes
Marie Janssen [Wed, 2 Dec 2015 23:09:12 +0000 (23:09 +0000)]
Merge "tests: don\'t use bt_os_callouts for wakelocks" am:
c61db8d557
am:
46c04cbc59 -s ours
* commit '
46c04cbc5992eb3d379363ab5e4ccb7d47ec498a':
tests: don't use bt_os_callouts for wakelocks
Ajay Panicker [Wed, 2 Dec 2015 00:21:06 +0000 (16:21 -0800)]
Synchronize Bluetooth stack init and cleanup
Bug:
25972918
Change-Id: Ia4fb4d74f8340862233dc5073596f3082863c941
Andre Eisenbach [Wed, 2 Dec 2015 21:26:05 +0000 (21:26 +0000)]
Compile as 64-bit library; fix includes
am:
d3842ed786
* commit '
d3842ed786d7adf1de9f0f9b2cd0de18fa5576e2':
Compile as 64-bit library; fix includes
Andre Eisenbach [Tue, 13 Oct 2015 01:32:46 +0000 (18:32 -0700)]
Compile as 64-bit library; fix includes
Change-Id: Ie5305d588ff54a80f06be786264e66042ddcf022
Marie Janssen [Wed, 2 Dec 2015 20:33:13 +0000 (20:33 +0000)]
Merge "tests: don\'t use bt_os_callouts for wakelocks"
am:
c61db8d557
* commit '
c61db8d5570d78e7e03e430ec5151a55bb77bdee':
tests: don't use bt_os_callouts for wakelocks
Marie Janssen [Wed, 2 Dec 2015 20:27:26 +0000 (20:27 +0000)]
Merge "tests: don't use bt_os_callouts for wakelocks"
Jakub Pawlowski [Wed, 2 Dec 2015 19:45:07 +0000 (19:45 +0000)]
Remove BTM_OOB_INCLUDED am:
175da70b6d
am:
c21b8d777c
* commit '
c21b8d777cda0eebf5186ffef7727fb99152030b':
Remove BTM_OOB_INCLUDED
Jakub Pawlowski [Wed, 2 Dec 2015 19:40:20 +0000 (19:40 +0000)]
Remove BTM_OOB_INCLUDED
am:
175da70b6d
* commit '
175da70b6d60349dffdee3a9cd13182b293edf4c':
Remove BTM_OOB_INCLUDED
Marie Janssen [Mon, 16 Nov 2015 18:35:17 +0000 (10:35 -0800)]
tests: don't use bt_os_callouts for wakelocks
Introduces alarm_set_wake_lock_paths so wake lock paths can be changed
for testing, and adds AlarmTestHarness::WakeLockHeld to test whether a
wake lock is currently held.
Bug:
25387683
Change-Id: I9a41ae8266e252a3d436f8d41ea3f9e7ecb45cdc
Jakub Pawlowski [Thu, 12 Nov 2015 23:00:58 +0000 (15:00 -0800)]
Remove BTM_OOB_INCLUDED
Bug:
22932952
Change-Id: I35dbcd1881a8bd627d1b1c6759761a356d07bcb2
Chris Elliott [Wed, 2 Dec 2015 02:03:23 +0000 (18:03 -0800)]
Switch to osi_getbuf.
Change-Id: I9333236a6ae7f880d45dbb40f68fb639775b49be
(cherry picked from commit
6f3844ceadaae752c0b3ce410cf5964d5c2baf94)
Abhijit Adsule [Tue, 19 May 2015 07:44:26 +0000 (02:44 -0500)]
A2DP SRC offload support
bluedroid changes to support A2DP SRC offload to BT FW.
add functionality to relay a2dp offload requests and responses
between AudioHAL & the BT vendor library.
Change-Id: Ie4e5992c48e95b0efb372a405e8537e4fd3ea071
Signed-off-by: Sridhar Vashist <svashist@motorola.com>
Andre Eisenbach [Tue, 1 Dec 2015 22:04:02 +0000 (22:04 +0000)]
Mark secure link as authenticated for LE am:
13bb0897a9
am:
0d8aaddb29
* commit '
0d8aaddb29bacdf67d983425f5c455f0250f0ef1':
Mark secure link as authenticated for LE
Andre Eisenbach [Tue, 1 Dec 2015 22:00:05 +0000 (22:00 +0000)]
Mark secure link as authenticated for LE
am:
13bb0897a9
* commit '
13bb0897a951f267680268b800084302c071e4cc':
Mark secure link as authenticated for LE
Andre Eisenbach [Sat, 14 Nov 2015 00:48:53 +0000 (16:48 -0800)]
Mark secure link as authenticated for LE
Without this change, reading an authenticated GATT characteristic using
BR/EDR would fail with an insufficient authentication error.
Change-Id: I02f44cdf90635b470b21e8aad8240993cb0e8e42
Pavlin Radoslavov [Tue, 1 Dec 2015 18:01:10 +0000 (18:01 +0000)]
Fix a race condition in the HCI module start_up() am:
c3e8824f8d
am:
318cab477c
* commit '
318cab477c8e69e888231b479d9e6f05cc04c998':
Fix a race condition in the HCI module start_up()
Pavlin Radoslavov [Tue, 1 Dec 2015 17:57:57 +0000 (17:57 +0000)]
Fix a race condition in the HCI module start_up()
am:
c3e8824f8d
* commit '
c3e8824f8d5266ee5d33be18c690b8de8f0562aa':
Fix a race condition in the HCI module start_up()
Pavlin Radoslavov [Tue, 1 Dec 2015 01:15:23 +0000 (17:15 -0800)]
Fix a race condition in the HCI module start_up()
* Fix a race condition when using the static startup_future
inside hci_layer.c
The future_new() allocation happens inside function start_up()
and the allocated "startup_future" value is returned, so the caller can
call future_await(future).
However, if firmware_config_callback() is called on another thread
BEFORE the "return startup_future;" statement is reached, then
"startup_future" is reset to NULL. As a result, the caller
will call future_await(NULL), and we have memory leak: startup_future
is never freed.
* Fix other similar potential race conditions inside stack_manager.c
where the static "hack_future" variable could be reassigned between
the future_new() and future_await() calls.
Bug:
25766403
Change-Id: I0ef1165efba7412c190dfa2a7660189b28fa78a6
Scott James Remnant [Mon, 30 Nov 2015 22:34:43 +0000 (22:34 +0000)]
Allow Bluetooth to build on systems with no LE support am:
dd339ab075
am:
8271d9900f
* commit '
8271d9900fe7a8be920d6d6a44ef96757789313d':
Allow Bluetooth to build on systems with no LE support
Scott James Remnant [Mon, 30 Nov 2015 22:32:44 +0000 (22:32 +0000)]
Allow Bluetooth to build on systems with no LE support
am:
dd339ab075
* commit '
dd339ab075d913334c84fe4c817c8ab09f5eda47':
Allow Bluetooth to build on systems with no LE support
Scott James Remnant [Thu, 19 Nov 2015 23:27:41 +0000 (15:27 -0800)]
Allow Bluetooth to build on systems with no LE support
Bug:
25387258
Change-Id: Ie82dae7a1a6807b398c067d4e1984a098793c589
Arman Uguray [Mon, 30 Nov 2015 21:15:33 +0000 (21:15 +0000)]
service: Refactor Client/Instance naming am:
bb18c41ffa
am:
960214d0e6
* commit '
960214d0e6c00ce32d54f504b86a35d43a8976d9':
service: Refactor Client/Instance naming
Arman Uguray [Mon, 30 Nov 2015 21:11:49 +0000 (21:11 +0000)]
service: Refactor Client/Instance naming
am:
bb18c41ffa
* commit '
bb18c41ffa0370d4eb0c4a15904b114355606466':
service: Refactor Client/Instance naming
Arman Uguray [Thu, 12 Nov 2015 21:44:31 +0000 (13:44 -0800)]
service: Refactor Client/Instance naming
Refactored the internal interfaces so that data structures with
per-application instances such as GattClient, GattServer, and
LowEnergyClient, and all other related data structures use "instance"
to generically refer to these instances rather than "client", which
was the naming inherited from BTIF.
Bug:
25650633
Change-Id: I1bda387f5d8fdccebe5eae7f058d7f8defafe8cc
Amadeusz Slawinski [Mon, 30 Nov 2015 16:39:16 +0000 (16:39 +0000)]
Add file write error checks to config_save am:
fd2f03a2e0
am:
8bab4b46b8
* commit '
8bab4b46b8fbd27fa0ab35e346c6a94c513acb45':
Add file write error checks to config_save
Andre Eisenbach [Mon, 30 Nov 2015 16:39:11 +0000 (16:39 +0000)]
Merge "Set bits 4-6 to 0 in L2CAP fixed channel supported bit mask." am:
4f820ee6f7
am:
71f3d97b9f
* commit '
71f3d97b9f8797b68801e84a30e35233168a570e':
Set bits 4-6 to 0 in L2CAP fixed channel supported bit mask.
Amadeusz Slawinski [Mon, 30 Nov 2015 16:35:40 +0000 (16:35 +0000)]
Add file write error checks to config_save
am:
fd2f03a2e0
* commit '
fd2f03a2e0ab304a2b67a5a3ecf2e4e73d58e6d9':
Add file write error checks to config_save
Andre Eisenbach [Mon, 30 Nov 2015 16:35:35 +0000 (16:35 +0000)]
Merge "Set bits 4-6 to 0 in L2CAP fixed channel supported bit mask."
am:
4f820ee6f7
* commit '
4f820ee6f7a59fe1a686e69de77ec932ce8a2f3c':
Set bits 4-6 to 0 in L2CAP fixed channel supported bit mask.
Amadeusz Slawinski [Tue, 3 Nov 2015 15:09:57 +0000 (16:09 +0100)]
Add file write error checks to config_save
It's better to leave old config file instead of
overwriting with broken one.
Fixes problem when disk is full and we can't write
more data to it.
Issue: KIONE-3099
Change-Id: Ifdb641ba7f3140655f9ec371e53b11a17484f27a
Andre Eisenbach [Mon, 30 Nov 2015 16:33:20 +0000 (16:33 +0000)]
Merge "Set bits 4-6 to 0 in L2CAP fixed channel supported bit mask."
Pavlin Radoslavov [Wed, 25 Nov 2015 16:22:23 +0000 (16:22 +0000)]
Add missing initialization of module OSI_MODULE am:
592afafb91
am:
db1817ab99
* commit '
db1817ab997cb6465b5df05fbbafb2542a0fb669':
Add missing initialization of module OSI_MODULE
Pavlin Radoslavov [Wed, 25 Nov 2015 16:17:51 +0000 (16:17 +0000)]
Add missing initialization of module OSI_MODULE
am:
592afafb91
* commit '
592afafb911cccc8aaa7d74c54f638e6bfb0a62d':
Add missing initialization of module OSI_MODULE
Pavlin Radoslavov [Wed, 25 Nov 2015 08:06:23 +0000 (00:06 -0800)]
Add missing initialization of module OSI_MODULE
Also, fix a resource leak (memory + file descriptors)
inside function AVDT_WriteReqOpt().
The leak was exposed by the module OSI_MODULE initialization fix
when audio is playing.
Bug:
21743601
Change-Id: Ia220042b9060b0640ac0851f4f9132ddf2773264
Jacob Lee [Mon, 23 Nov 2015 20:49:26 +0000 (20:49 +0000)]
Memory overwrite due to HDP doesn\'t allocate enough buffer am:
4d7575b601
am:
ec14550ab5
* commit '
ec14550ab5d4963988951709fd3c5983986274cc':
Memory overwrite due to HDP doesn't allocate enough buffer
Sharvil Nanavati [Mon, 23 Nov 2015 20:49:23 +0000 (20:49 +0000)]
Reapply "Fix broken test caused by misordered callback arguments." am:
ea01e8d0a3
am:
85b03e446c
* commit '
85b03e446cbf701854bfab8e550e8bc1355ca4b0':
Reapply "Fix broken test caused by misordered callback arguments."
Jacob Lee [Mon, 23 Nov 2015 20:45:42 +0000 (20:45 +0000)]
Memory overwrite due to HDP doesn\'t allocate enough buffer
am:
4d7575b601
* commit '
4d7575b601cd3e0408312d103d0c10cf597c82ab':
Memory overwrite due to HDP doesn't allocate enough buffer
Sharvil Nanavati [Mon, 23 Nov 2015 20:45:39 +0000 (20:45 +0000)]
Reapply "Fix broken test caused by misordered callback arguments."
am:
ea01e8d0a3
* commit '
ea01e8d0a3563ce12e8c0af81da48de04eb5effc':
Reapply "Fix broken test caused by misordered callback arguments."
Jacob Lee [Fri, 11 Sep 2015 06:06:48 +0000 (14:06 +0800)]
Memory overwrite due to HDP doesn't allocate enough buffer
HDP doesn't allocate enough buffer, so L2CAP overwrite two bytes.
Allocation tracker trigger assert due to find that memory be overwrite.
Bug:
23981241
Change-Id: Ib2c27472b16de2188758ec521ef290d6c9a6c8f0
Sharvil Nanavati [Sat, 7 Nov 2015 10:12:16 +0000 (02:12 -0800)]
Reapply "Fix broken test caused by misordered callback arguments."
For some reason this change is missing from aosp/master.
Change-Id: I0b73cdf01d1a6796e224add5e5ebc686b0ac95c8
Scott James Remnant [Mon, 23 Nov 2015 20:35:03 +0000 (20:35 +0000)]
Use aosp/master version of
bdd19e08
am:
9ecdf9c0c4
* commit '
9ecdf9c0c496be8c4835e0b1c033fe350e3e0ba0':
Use aosp/master version of
bdd19e08
Scott James Remnant [Mon, 23 Nov 2015 20:29:35 +0000 (12:29 -0800)]
Use aosp/master version of
bdd19e08
Change-Id: I2ec22a47cb4a7e1a9d26f6cf7029214f6cd97a7e
Ajay Panicker [Mon, 23 Nov 2015 20:25:30 +0000 (20:25 +0000)]
Prevent integer overflows during GATT signing am:
c8fd18625f
am:
7da957c2c0
* commit '
7da957c2c0e3df382d32f8a7125f555e5f8ad3c8':
Prevent integer overflows during GATT signing
Andre Eisenbach [Mon, 23 Nov 2015 20:25:26 +0000 (20:25 +0000)]
Raise alarm callback thread priority am:
41a91a52b0
am:
ab6ec2bc93
* commit '
ab6ec2bc930e080aae9cb5c3d82650624f512a04':
Raise alarm callback thread priority
Mattias Agren [Mon, 23 Nov 2015 20:25:21 +0000 (20:25 +0000)]
Reduce persistence on aquiring master role am:
77e70b4b2d
am:
752c1cd5bc
* commit '
752c1cd5bcc298e9daeacaf64244ffbb5059e6c7':
Reduce persistence on aquiring master role
Ajay Panicker [Mon, 23 Nov 2015 20:21:43 +0000 (20:21 +0000)]
Prevent integer overflows during GATT signing
am:
c8fd18625f
* commit '
c8fd18625fc12e9831cf5d94d315d541e3944e02':
Prevent integer overflows during GATT signing
Andre Eisenbach [Mon, 23 Nov 2015 20:21:40 +0000 (20:21 +0000)]
Raise alarm callback thread priority
am:
41a91a52b0
* commit '
41a91a52b06171140938a1aa503bab8fe15e12e4':
Raise alarm callback thread priority
Mattias Agren [Mon, 23 Nov 2015 20:21:37 +0000 (20:21 +0000)]
Reduce persistence on aquiring master role
am:
77e70b4b2d
* commit '
77e70b4b2d0b4bf1fc319a705701c1726589b2fc':
Reduce persistence on aquiring master role
Ajay Panicker [Fri, 23 Oct 2015 23:49:11 +0000 (16:49 -0700)]
Prevent integer overflows during GATT signing
Bug:
17901099
Change-Id: Ib61113b19c9c9798b9ea992fad0ce997dcc2e2f8
Andre Eisenbach [Fri, 23 Oct 2015 17:40:36 +0000 (10:40 -0700)]
Raise alarm callback thread priority
Since alarms [/callbacks] are used in the critical audio path, raising
the thread priority is required to ensure timely encoding/transmission
of audio packets and avoiding thread pre-emption.
This patch indiscriminatly raises the (single) callback thread priority,
affecting all alarm callbacks. In the future, thread priotiry should be
adjusted based on the alarms pending in the queue.
Bug:
24570959
Change-Id: I64928fd7325f1d6f76815a185dbccf1e01ae30d2
Mattias Agren [Wed, 14 Oct 2015 15:05:58 +0000 (17:05 +0200)]
Reduce persistence on aquiring master role
Whenever a device has more than 1 ACL link active and transferring
data on one of its links via PAN, HH or JV (RFCOMM) the sys busy/idle
state toggles frequently. To avoid triggering role switches for each
of these events we filter this out and let the other SYS events handle
it in combination with other role policy management code. Ideally we
should revert the toggling to properly reflect the busy/idle state of
each profile but to limit risk of side effects at this stage we will
make this intermittent change.
This also affects audio streaming in certain cases.
Bug:
24570959,
25129209
Change-Id: I141e17ee069c82624e153fd8de5db90ae93724b9
Sharvil Nanavati [Mon, 23 Nov 2015 18:53:06 +0000 (18:53 +0000)]
Merge "Fix broken test caused by misordered callback arguments." into cw-e-dev
am:
bedd614381
* commit '
bedd6143818b91e47b44e4fe67835594d10b62e1':
Fix broken test caused by misordered callback arguments.
Andre Eisenbach [Mon, 23 Nov 2015 18:53:03 +0000 (18:53 +0000)]
Always update remote address type during LE scan am:
03d171170c
am:
02ddf25bd0
* commit '
02ddf25bd0e7f5af6205957b8a63e06378141632':
Always update remote address type during LE scan
Andre Eisenbach [Mon, 23 Nov 2015 18:53:00 +0000 (18:53 +0000)]
Merge "Do not mask out secure connections (SC) bit for BT <4.2" into mnc-dr-dev am:
15c1f685db
am:
442e504115
* commit '
442e5041158a6c2af28e570b245d2cccdc048a8e':
Do not mask out secure connections (SC) bit for BT <4.2
Andre Eisenbach [Mon, 23 Nov 2015 18:52:57 +0000 (18:52 +0000)]
Fix bug in SDP 128-bit UUID lookup am:
7312c6d913
am:
50d8df7a33
* commit '
50d8df7a33e19e7fb753ffbfe7f6a982fc76488a':
Fix bug in SDP 128-bit UUID lookup
Andre Eisenbach [Mon, 23 Nov 2015 18:52:55 +0000 (18:52 +0000)]
Serialize remote version query over LE am:
864e7734f2
am:
b2bf772af1
* commit '
b2bf772af125597ecc7ec36f434728ef8a942aff':
Serialize remote version query over LE
Andre Eisenbach [Mon, 23 Nov 2015 18:52:51 +0000 (18:52 +0000)]
Check remote LMP version before enabling secure connections am:
4f7c4f6732
am:
406a266f13 -s ours
* commit '
406a266f137f88ab34ac3d6425614ba5350878df':
Check remote LMP version before enabling secure connections
Andre Eisenbach [Fri, 20 Nov 2015 21:48:17 +0000 (21:48 +0000)]
Fix flaky EagerReaderTest.test_large_data_multibyte am:
b74ef93233
am:
03b1e30775
* commit '
03b1e30775ced16c82a3ccfa5dd2f2ef8e35ea38':
Fix flaky EagerReaderTest.test_large_data_multibyte
Andre Eisenbach [Fri, 20 Nov 2015 21:45:31 +0000 (21:45 +0000)]
Fix flaky EagerReaderTest.test_large_data_multibyte
am:
b74ef93233
* commit '
b74ef9323325068f43e7f7765cd8b858881ab197':
Fix flaky EagerReaderTest.test_large_data_multibyte
Andre Eisenbach [Fri, 20 Nov 2015 19:41:16 +0000 (11:41 -0800)]
Fix flaky EagerReaderTest.test_large_data_multibyte
eager_reader_read() makes no guarantee that the number of bytes read
equals the number of bytes to be read. Insisting that it must in the
test can lead to race conditions where not all data is read at once and
the test fails.
Adjusted test to match API promise.
Change-Id: I5df4b6d8df61d0601402511bb3d9f29f22378981
yanlaijun [Wed, 11 Nov 2015 03:16:14 +0000 (11:16 +0800)]
Set bits 4-6 to 0 in L2CAP fixed channel supported bit mask.
The L2CAP fixed channels supported bit mask is defined by BT
core spec v4.2 Vol 3, Part A, section 4.13. As this section
describes, bits 4-6 shall be set to 0.
Change-Id: I5fa626b45e3876f8128aae8946fbce3df77532bf
Signed-off-by: yanlaijun <yan.laijun@gmail.com>
Scott James Remnant [Wed, 18 Nov 2015 20:05:57 +0000 (20:05 +0000)]
Pass unknown run_unit_tests long arguments to tests am:
6babef0456
am:
bc2b435ab4
* commit '
bc2b435ab416d71ddcb0021ae9a9ab1da99aa43c':
Pass unknown run_unit_tests long arguments to tests
Scott James Remnant [Wed, 18 Nov 2015 19:59:18 +0000 (19:59 +0000)]
Pass unknown run_unit_tests long arguments to tests
am:
6babef0456
* commit '
6babef04564490d0843504f7abe9f5217570f5ef':
Pass unknown run_unit_tests long arguments to tests
Scott James Remnant [Wed, 18 Nov 2015 19:45:43 +0000 (19:45 +0000)]
Add test filter option to run_unit_tests am:
753c074b44
am:
138f65e659
* commit '
138f65e6596a734eac9c7dc81d74041bb22393e2':
Add test filter option to run_unit_tests
Scott James Remnant [Wed, 18 Nov 2015 19:38:50 +0000 (19:38 +0000)]
Add test filter option to run_unit_tests
am:
753c074b44
* commit '
753c074b449596f80224dec367816366fbd9bfe9':
Add test filter option to run_unit_tests
Scott James Remnant [Wed, 18 Nov 2015 19:18:02 +0000 (11:18 -0800)]
Pass unknown run_unit_tests long arguments to tests
e.g. ./run_unit_tests.sh --v=2
./run_unit_tests.sh --gtest_filter=*Advertise*
Change-Id: I63e7549d850a15107ca56333868cc8ccd3eeb893
Scott James Remnant [Wed, 18 Nov 2015 19:24:31 +0000 (19:24 +0000)]
Give run_unit_tests an exit code am:
0ff191abbf
am:
a3feca655c
* commit '
a3feca655cd2a6a38ddef02b8394655a248316cc':
Give run_unit_tests an exit code
Scott James Remnant [Wed, 18 Nov 2015 17:35:43 +0000 (09:35 -0800)]
Add test filter option to run_unit_tests
e.g. ./run_unit_test.sh net_test_hci.HciLayerTest.*
Useful since this script wraps the hard part of pushing the binary
to the device and then shell to running it.
This also allows multiple individual tests to be run, since the filter
is per-target rather than global.
Change-Id: I74a6511ab226fb55054cbb840bb47815e0fdc97e
Scott James Remnant [Wed, 18 Nov 2015 19:17:29 +0000 (19:17 +0000)]
Give run_unit_tests an exit code
am:
0ff191abbf
* commit '
0ff191abbfa3d23d4e8a81cb674509580873bdc2':
Give run_unit_tests an exit code
Scott James Remnant [Wed, 18 Nov 2015 17:40:03 +0000 (09:40 -0800)]
Give run_unit_tests an exit code
So you can tell whether tests failed by checking $?
Change-Id: I0eb55c49946a4183206bd68cd3c0b1bdc69f6bb0
Arman Uguray [Wed, 18 Nov 2015 03:52:49 +0000 (03:52 +0000)]
service/test: Reset command-line on SetUp am:
8531fc3571
am:
1c13443412
* commit '
1c1344341213eac001eb0d5127f319c8515d8b60':
service/test: Reset command-line on SetUp
Arman Uguray [Wed, 18 Nov 2015 03:47:53 +0000 (03:47 +0000)]
service/test: Reset command-line on SetUp
am:
8531fc3571
* commit '
8531fc357121b8e2fc0135b00f7703205e64e7e7':
service/test: Reset command-line on SetUp
Arman Uguray [Wed, 18 Nov 2015 03:29:31 +0000 (19:29 -0800)]
service/test: Reset command-line on SetUp
Changed SettingsTest to reset the global base::CommandLine on
SetUp so the the first test case that runs follows a clean state.
Bug:
25753839
Change-Id: I0d536e1f85036fccd0099e03f7f59289f5411c50
Hung-ying Tyan [Wed, 18 Nov 2015 02:09:06 +0000 (02:09 +0000)]
Merge "Memory overwrite due to HDP doesn't allocate enough buffer"
Scott James Remnant [Wed, 18 Nov 2015 00:37:13 +0000 (00:37 +0000)]
Add -s <specific device> to run_unit_tests am:
03e8be8b11
am:
5d384a505a
* commit '
5d384a505ab85e6a0f9736a0c2077ac482103f4b':
Add -s <specific device> to run_unit_tests
Scott James Remnant [Wed, 18 Nov 2015 00:17:32 +0000 (00:17 +0000)]
Add -s <specific device> to run_unit_tests
am:
03e8be8b11
* commit '
03e8be8b11c4e277a7c4600847a49a4b152b40a7':
Add -s <specific device> to run_unit_tests
Scott James Remnant [Tue, 17 Nov 2015 23:09:43 +0000 (15:09 -0800)]
Add -s <specific device> to run_unit_tests
For the developer with more than one Android or Brillo device plugged
into their workstation at once.
Change-Id: Ice273564f2debdc0708ce473be6119ff2ae33f39
Pavlin Radoslavov [Tue, 17 Nov 2015 09:45:46 +0000 (01:45 -0800)]
Revert "Enable kernel wakelocks and timers"
This reverts commit
28bf007f7103ccd36d5fa2f87837947a27cc698d.
The revert is needed because of kernel wakelock related issues
on Fugu.
Change-Id: Id8383a12b12aad8c5fb66c0c2ddfe2d42a85c9c2
Arman Uguray [Thu, 12 Nov 2015 20:54:49 +0000 (20:54 +0000)]
Merge "service/client: Add register|unregister-gatt" am:
6b881b1ff9
am:
a269e0676d
* commit '
a269e0676d3d3e3961ec628434f868b1b877c1d5':
service/client: Add register|unregister-gatt
Arman Uguray [Thu, 12 Nov 2015 20:54:46 +0000 (20:54 +0000)]
Merge "service: Introduce bluetooth::GattClient" am:
3445e896b5
am:
ecad06cb6c
* commit '
ecad06cb6cbdebfd1d399c73067984bc26ce3964':
service: Introduce bluetooth::GattClient
Arman Uguray [Thu, 12 Nov 2015 20:54:43 +0000 (20:54 +0000)]
Merge "service: Add IBluetoothGattClient IPC bindings" am:
3ee69e43c2
am:
83d02310c3
* commit '
83d02310c31de4614ab19e4076d4580902170193':
service: Add IBluetoothGattClient IPC bindings
Arman Uguray [Thu, 12 Nov 2015 20:51:02 +0000 (20:51 +0000)]
Merge "service/client: Add register|unregister-gatt"
am:
6b881b1ff9
* commit '
6b881b1ff9c062a5c35a41fb47018f3cec20832f':
service/client: Add register|unregister-gatt
Arman Uguray [Thu, 12 Nov 2015 20:50:59 +0000 (20:50 +0000)]
Merge "service: Introduce bluetooth::GattClient"
am:
3445e896b5
* commit '
3445e896b5357a6f33110573f4743b23aaa9e7a9':
service: Introduce bluetooth::GattClient
Arman Uguray [Thu, 12 Nov 2015 20:50:55 +0000 (20:50 +0000)]
Merge "service: Add IBluetoothGattClient IPC bindings"
am:
3ee69e43c2
* commit '
3ee69e43c29f2268a3b0961f126b9cd7a8efcbd1':
service: Add IBluetoothGattClient IPC bindings
Arman Uguray [Thu, 12 Nov 2015 20:45:10 +0000 (20:45 +0000)]
Merge "service/client: Add register|unregister-gatt"
Arman Uguray [Thu, 12 Nov 2015 20:45:01 +0000 (20:45 +0000)]
Merge "service: Introduce bluetooth::GattClient"
Arman Uguray [Thu, 12 Nov 2015 20:44:41 +0000 (20:44 +0000)]
Merge "service: Add IBluetoothGattClient IPC bindings"
Jacob Lee [Fri, 11 Sep 2015 06:06:48 +0000 (14:06 +0800)]
Memory overwrite due to HDP doesn't allocate enough buffer
HDP doesn't allocate enough buffer, so L2CAP overwrite two bytes.
Allocation tracker trigger assert due to find that memory be overwrite.
Bug:
23981241
Change-Id: Ib2c27472b16de2188758ec521ef290d6c9a6c8f0
Scott James Remnant [Thu, 12 Nov 2015 00:54:50 +0000 (00:54 +0000)]
net_test_bluetooth: replace with gtest variant am:
e27d3133c2
am:
a16a0266e4
* commit '
a16a0266e4653ab9fcae620706c1c167cc4455c5':
net_test_bluetooth: replace with gtest variant
Scott James Remnant [Thu, 12 Nov 2015 00:51:43 +0000 (00:51 +0000)]
net_test_bluetooth: replace with gtest variant
am:
e27d3133c2
* commit '
e27d3133c26d299ac9c776670031957f2d9bad04':
net_test_bluetooth: replace with gtest variant
Scott James Remnant [Wed, 11 Nov 2015 19:51:20 +0000 (11:51 -0800)]
net_test_bluetooth: replace with gtest variant
Bug:
25385380
Change-Id: Ia719363823d8d538caa6b42f076d5d6d737ae036
Pavlin Radoslavov [Wed, 11 Nov 2015 20:10:55 +0000 (20:10 +0000)]
Fix SIGBUS crash when copying data am:
3f06e14fdd
am:
c4203a27fc
* commit '
c4203a27fc0efc6879ab7e8b8d005cb342fb66bb':
Fix SIGBUS crash when copying data
Pavlin Radoslavov [Wed, 11 Nov 2015 20:05:46 +0000 (20:05 +0000)]
Fix SIGBUS crash when copying data
am:
3f06e14fdd
* commit '
3f06e14fddc0e674347ae28ea4a25218d4ce1d2a':
Fix SIGBUS crash when copying data
Pavlin Radoslavov [Tue, 10 Nov 2015 02:39:03 +0000 (18:39 -0800)]
Fix SIGBUS crash when copying data
We have the following memory alignment-related issue, that seems
to be architecture/compiler/memcpy(3) specific.
Within struct tBTIF_CONTEXT_SWITCH_CBACK, the beginning of the
zero-length array "char p_param[]" is not aligned (because of the
struct internals).
However, this p_param pointer is casted within function
btif_gattc_deep_copy() to the struct pointer (btif_adv_data_t *).
By definition, the memory pointed to by such pointer is suppose
to be aligned:
btif_adv_data_t *dst = (btif_adv_data_t*) p_dest;
It seems that on some architectures/compilers the executed memcpy()
instructions are optimized for such memory alignment.
If the memory was not aligned, we get SIGBUS.
Apparently, just using (void *) casting for the memcpy() destination,
avoids using the optimized memory aligned instructions:
memcpy((void *)dst, src, ...);
The solutions are twofold:
* Make sure that "char p_param[]" within struct
tBTIF_CONTEXT_SWITCH_CBACK is aligned. Otherwise, the casting
to "(btif_adv_data_t*)" can be problematic.
* Add (void *) casting to all memcpy() calls which might be
referring to such mis-aligned memory.
This is done by using the new macro maybe_non_aligned_memcpy()
in all places that such casting might be needed.
Either solution is sufficient to prevent the crash as identified in
this particular case. We need to apply both solutions, to reduce the
chance of running again into a similar issue.
Bug:
25601669
Change-Id: I6c49645c00f10c594a5d1e53a9fac202c506657c
Andre Eisenbach [Wed, 11 Nov 2015 18:54:09 +0000 (18:54 +0000)]
Indicate failed tests in run_unit_tests.sh am:
7ab59096c2
am:
08a960d795
* commit '
08a960d7952900c419b8afa107af9d1e00e8b03f':
Indicate failed tests in run_unit_tests.sh
Andre Eisenbach [Wed, 11 Nov 2015 18:50:29 +0000 (18:50 +0000)]
Indicate failed tests in run_unit_tests.sh
am:
7ab59096c2
* commit '
7ab59096c26fe1175258f4cf40674736884ceeb0':
Indicate failed tests in run_unit_tests.sh
Myles Watson [Wed, 11 Nov 2015 18:46:33 +0000 (18:46 +0000)]
Merge "Retry HID Polling when EINTR is returned" am:
95e0c57578
am:
3d1d6595ec
* commit '
3d1d6595ec8a44b6db3f89c8f81dd3125d8ba65f':
Retry HID Polling when EINTR is returned
Andre Eisenbach [Tue, 10 Nov 2015 22:17:20 +0000 (14:17 -0800)]
Indicate failed tests in run_unit_tests.sh
Previously "run_unit_tests.sh --all" did not indicate to the user if a
unit test other than the last one failed.
Change-Id: I9b64e4280612cd9af18acc17f245b8760bea793f