OSDN Git Service
liuchao [Wed, 4 Jan 2017 20:41:22 +0000 (20:41 +0000)]
Fix an inappropriate sscanf return value judgment
am:
0e42408b91
Change-Id: Ic3d9b940b9470590da8b7f403066757d0e6e2f91
liuchao [Wed, 4 Jan 2017 02:46:06 +0000 (10:46 +0800)]
Fix an inappropriate sscanf return value judgment
This fixes an inappropriate sscanf return value judgment that
res check here is not needed while res2 is the one that need to be checked
Test: mm -j 8
Change-Id: I3e332286c9434d5b9d01421f5f421039f84ad6c7
Ivan Podogov [Wed, 4 Jan 2017 15:44:31 +0000 (15:44 +0000)]
Make HID Device service independent from HID Host.
am:
2a399b3745
Change-Id: I21033a763e8103d35ff44a0a6d503935e504b12f
Ivan Podogov [Tue, 3 Jan 2017 12:29:45 +0000 (12:29 +0000)]
Make HID Device service independent from HID Host.
By default, enabling the HID Device service is only possible
during disabling the HID Host service. If, on the other hand,
the HID Host service was never initialized, then a request to
enable the HID Device service should just be executed
immediately.
Test: manual, on a device without the HID Host profile.
Change-Id: I2ab4b8aec413b66d57eb322d38660f1b4c48ba32
Ivan Podogov [Wed, 4 Jan 2017 13:00:03 +0000 (13:00 +0000)]
Merge "Allow HID Device to connect to a specific device"
am:
7bd36a3588
Change-Id: Ib9155090374c80102ee9874b4c692955ce1b60de
Treehugger Robot [Wed, 4 Jan 2017 12:56:49 +0000 (12:56 +0000)]
Merge "Allow HID Device to connect to a specific device"
Pavlin Radoslavov [Wed, 4 Jan 2017 03:40:07 +0000 (03:40 +0000)]
Add a mechanism for configuring the A2DP Source codecs
am:
5ce0116fbf
Change-Id: Ieacf4534900cf360aaa32d676d42e13d0cb80498
Pavlin Radoslavov [Mon, 5 Dec 2016 21:02:26 +0000 (13:02 -0800)]
Add a mechanism for configuring the A2DP Source codecs
* Codec config internal abstraction:
- Add new classes A2dpCodecConfig and A2dpCodecs that (will)
encapsulate all codec-related APIs
- Add unit tests for the above two classes
- Add method A2dpCodecConfig.buildCodecConfig(), and use it when
creating the codec configuration instead of A2DP_InitSource2SinkCodec().
The new method can build the codec config by taking into account
optional user codec-related configuration preferences.
- Use the A2DP codec config API from the hardware/libhardware bt_av.h API
- Replace enum tA2DP_CODEC_SEP_INDEX with btav_a2dp_codec_index_t
from the bt_av.h API
- Move codec-specific functions from stack/include/a2dp_api.h
and stack/a2dp/a2dp_api.cc to stack/include/a2dp_codec_api.h
and stack/a2dp/a2dp_codec_config.cc
- Create a new base class A2dpCodecConfig() to hold some of the
codec-related state, and implement the corresponding A2dpCodecConfigSbc
and A2dpCodecConfigSbcSink derived classes.
- Move A2DP spec-related constants from stack/include/a2dp_api.h
to stack/include/a2dp_constants.h
- Move A2DP-related error codes from stack/include/a2dp_api.h
to stack/include/a2dp_error_codes.h
- Move A2DP SBC spec-related constants from stack/include/a2dp_sbc.h to
stack/include/a2dp_sbc_constants.h
* Implement the backend mechanism for handling user (re)configuration of
A2DP Source codecs as requested via the JNI API calls.
Also, any codec changes are reported back via JNI API callbacks.
The current audio parameter selection (sample rate, bits per
sample, channel mode - mono/stereo) is as follows:
- If the user selected parameters are acceptable (based on
local codec capability and the remote Sink capability),
those parameters are used.
- Else if the Audio HAL's requested parameters are acceptable,
those are used.
- Else if the default settings are acceptable, those are used.
- Else use the best match among the local and the remote device's
capabilities.
* Update the mechanism for handling OTA configuration requests from the
remote Sink device.
- The OTA prefered codec configuration is ignored if the current
codec configuration contains explicit user configuration, or if the
codec configuration for the same codec contains explicit user
configuration.
* Refactor the Audio HAL <-> Bluetooth audio parameter negotiation
mechanism:
The new mechanism gives some flexibility to the Media Framework to
choose the appropriate audio format (sample rate, bits per sample,
and channel mode - mono/stereo), and at the same time allows
the Bluetooth stack to double-check / overwrite the choice.
- out_get_parameters() on the Audio HAL side asks the Bluetooth stack
for all currently supported formats (for the current codec),
and returns them to the Media Framework: sample rate, bits per sample,
and channel mode (mono/stereo).
- The first time adev_open_output_stream() is called on the Audio HAL,
it asks the Bluetooth stack about the audio format currently selected
by the Bluetooth stack (based on codec negotiation with the Sink device,
and User Configuration).
- The second time adev_open_output_stream() is called on the Audio HAL,
its "config" will eventually contain the audio format selected
internally by the Media Framework. That audio format is sent to the
Bluetooth stack.
If that format is acceptable to the Bluetooth stack, the Bluetooth
stack will reconfigure itself internally, and will respond back with
those values. Otherwise, it will respond back with the values that
should be used instead.
* Misc other fixes and refactoring:
- Fix the BTA handling of A2DP codec reconfiguration
- Fix a bug in the implementation of A2DP_BitsSet(), and add the
approriate unit test. Also, fix the code that was using this function
incorrectly.
- The SBC encoder is compiled as a separate library
- Replace leftover usage of "false" with "FALSE" for macros, and
vice-versa for variable values.
Test: A2DP streaming to headsets, TestPlans/71390
Bug:
30958229
Change-Id: I440b6126e2250e33b0075f9789dd93154c007c2b
Jakub Pawlowski [Tue, 3 Jan 2017 23:48:40 +0000 (23:48 +0000)]
Fix failling ClosureTest
am:
dec747b3ba
Change-Id: Ide2dd751115739bcfe8c2966d993c1cd750e0966
Jakub Pawlowski [Tue, 3 Jan 2017 21:53:34 +0000 (13:53 -0800)]
Fix failling ClosureTest
BTA closure doesn't keep the HDR messages any more, test have keep track
of HDR pointers for itself.
Bug:
33947176
Test: test/run_unit_tests.sh net_test_bta
Change-Id: I32994f248dc2e082bf8bed426a32acf677c58ed5
Ivan Podogov [Fri, 30 Dec 2016 15:19:48 +0000 (15:19 +0000)]
Allow HID Device to connect to a specific device
With this change, when the app requests a connection to a
specific device, it is always "plugged" first.
Unplugging the previous device is left for the app to do.
Test: make
Change-Id: I2e27c12e2ee96d0c311615a3853d8c430f3b2c31
Jakub Pawlowski [Fri, 30 Dec 2016 06:30:35 +0000 (06:30 +0000)]
LE scanner BTA layer simplification
am:
e396065650
Change-Id: If42006688b29d3bae5345ced48d43bb74fc52335
Jakub Pawlowski [Fri, 30 Dec 2016 06:30:17 +0000 (06:30 +0000)]
Merge "Fix race condition in do_in_bta_thread"
am:
8534bc3889
Change-Id: Ia6c5aa8e2bbd7b0288dd999cdc7c03bf1092b1ae
Jakub Pawlowski [Thu, 29 Dec 2016 09:23:52 +0000 (01:23 -0800)]
LE scanner BTA layer simplification
BTA layer for scanner is very complicated. This patch simplifies it:
* get rid of type redeclarations for BTM types
* get rid of trivial *_act methods and call BTM API directly where possible
Bug:
30622771
Test: slra FilterTest
Change-Id: I3899b30074b2abc4a3945c5cc14f1bb40a504876
Jakub Pawlowski [Fri, 30 Dec 2016 06:25:08 +0000 (06:25 +0000)]
Merge "Fix race condition in do_in_bta_thread"
Jakub Pawlowski [Thu, 29 Dec 2016 06:45:34 +0000 (22:45 -0800)]
Fix race condition in do_in_bta_thread
Attach posted_task to the HDR message, instead of using a queue.
Bug:
33947176
Test: re-run sl4a FilteringTest 3 times with no flakiness
Change-Id: If0b69e82d11eeae52ac8e591bebff634073251f1
Hemant Gupta [Thu, 29 Dec 2016 19:39:01 +0000 (19:39 +0000)]
HIDD: Add support for HID Device Role
am:
8843cc830b
Change-Id: I9f5b818dc50c8a99502bb2373db31ef8557d598a
Hemant Gupta [Fri, 18 Apr 2014 07:04:55 +0000 (12:34 +0530)]
HIDD: Add support for HID Device Role
This patch adds support for HID Device role in bluedroid stack allowing
DUT to be used as Keyboard or Mouse.
Bug:
33011576
Change-Id: I45b581a54f6c7bbc1f25226715a7ea23e34255c0
Jakub Pawlowski [Thu, 29 Dec 2016 05:24:51 +0000 (05:24 +0000)]
HCI interface improvements
am:
dabf8d36c6
Change-Id: I0d78a25eaacd0dc45ac7cd76eedfc0a374c0a36f
Jakub Pawlowski [Wed, 28 Dec 2016 12:47:37 +0000 (04:47 -0800)]
HCI interface improvements
This patch improves btu_hcif_send_cmd_with_cb, which will accept
base::Callback instead of function pointer as argument. It will also
carry information about where was packet send from, which can be
displayed when command status is received, greatly improving logs.
The improved method is also used for handling VSC advertising.
Bug:
30622771
Test: sl4a ConcurrentBleAdvertiserTest
Change-Id: I55c3e32f9231c00bfa85f971265809d6f1fecdfb
Jakub Pawlowski [Thu, 29 Dec 2016 01:36:39 +0000 (01:36 +0000)]
Fix AdvertisingManager not being initialized
am:
2255250d9b
Change-Id: Ib4328198433e89853316c727f648a26dfe97025e
Jakub Pawlowski [Thu, 22 Dec 2016 11:13:00 +0000 (03:13 -0800)]
Fix AdvertisingManager not being initialized
When BLE_VND_INCLUDED is not set, advertising was not properly
initialized, which resulted in stack crashes. This patch makes sure that
LE advertising is always properly initialized
Bug:
33168939
Test: enable LE advertising with BLE_VND_INCLUDED set to false
Change-Id: I5fa0b3da39da99e750e1f8b6f0452a628094bfc4
Jakub Pawlowski [Wed, 28 Dec 2016 21:02:51 +0000 (21:02 +0000)]
Fix pointer type in BTA_DmBleCfgFilterCondition
am:
ce34742e35
Change-Id: I36d2b506e610a60819e981892d9655eacf78d562
Jakub Pawlowski [Wed, 28 Dec 2016 07:50:12 +0000 (23:50 -0800)]
Fix pointer type in BTA_DmBleCfgFilterCondition
p_cond_param->srvc_uuid is of type tBTA_DM_BLE_PF_UUID_COND
Bug:
33910711
Test: sl4a FilteringTest
Change-Id: I6b30e1e441f8256d8c8dbf593f746a3d7810eda6
Andre Eisenbach [Wed, 28 Dec 2016 00:30:35 +0000 (00:30 +0000)]
Fix pointer arithmetic in BTA_DmBleCfgFilterCondition
am:
bced7f0c0b
Change-Id: I59ba47e90c7c282ab21263a153d6886761edd725
Andre Eisenbach [Tue, 27 Dec 2016 22:48:34 +0000 (14:48 -0800)]
Fix pointer arithmetic in BTA_DmBleCfgFilterCondition
Using the pointer to the beginning of a union in a member of the union,
which will then be over-written, is a bad idea(TM).
Bug:
33910711
Test: manual
Change-Id: I0b979e493688bf8c02119a2ef6707d6c8e730dcb
Myles Watson [Wed, 21 Dec 2016 22:09:36 +0000 (22:09 +0000)]
osi: Return 0 on osi_property_get failure
am:
17c66c45e6
Change-Id: I7968e8734b610530fe419cbe79fb8e149b2a0a7d
Myles Watson [Sat, 17 Dec 2016 01:01:42 +0000 (17:01 -0800)]
osi: Return 0 on osi_property_get failure
Test: mma -j32
Change-Id: Ia1aae4cd5618816b529449844b3a0724e4eb3200
Jakub Pawlowski [Tue, 20 Dec 2016 22:52:27 +0000 (22:52 +0000)]
Linux build fix
am:
71f5b3ee55
Change-Id: Ifd3362d6e73cabdd6fef1e973f2b1a4be4ae5005
Jakub Pawlowski [Tue, 20 Dec 2016 20:55:51 +0000 (12:55 -0800)]
Linux build fix
Test: compilation test
Change-Id: I0834431378b015eafbb26c48af342af4a650972b
Jakub Pawlowski [Tue, 20 Dec 2016 19:09:26 +0000 (19:09 +0000)]
Remove reduntant capabilities check
am:
30c4bfe8dd
Change-Id: Idee00ad65b55e1c84f0c4437013f92ea0a018c7f
Jakub Pawlowski [Tue, 20 Dec 2016 03:11:40 +0000 (03:11 +0000)]
Get rid of BLE_ANDROID_CONTROLLER_SCAN_FILTER
am:
d494104585
Change-Id: Ibc8f175338f21a6597b40071cc2cb53e6028b403
Jakub Pawlowski [Tue, 20 Dec 2016 01:05:33 +0000 (17:05 -0800)]
Remove reduntant capabilities check
BTM layer checks if LE is avaliable, and if proper VSC are
avaliable, no need to do additional checks in BTA.
Test: sl4a FilteringTest
Bug:
30622771
Change-Id: I594b152d18f08a46b65930547a991dbb6f188c4b
Jakub Pawlowski [Tue, 20 Dec 2016 00:13:08 +0000 (16:13 -0800)]
Get rid of BLE_ANDROID_CONTROLLER_SCAN_FILTER
All calls to filter related code is guarded by check if HCI VSC are
available. There is no need to keep double check.
Test: sl4a FilteringTest
Bug:
30622771
Change-Id: Ib4c53593d536a2985926ef2b725bc69050bdb035
Jack He [Tue, 20 Dec 2016 00:44:55 +0000 (00:44 +0000)]
Merge "Remove btif dependency on libmedia"
am:
f585f29d2c
Change-Id: Ic98a105c01445c7fafc60e6c33495fc061a5ed07
Jakub Pawlowski [Tue, 20 Dec 2016 00:44:05 +0000 (00:44 +0000)]
Modernize BLE Scanner implementation (2/3)
am:
808650d846
Change-Id: If4f17d74becab4c36549f42807f5599f5d535b01
Treehugger Robot [Tue, 20 Dec 2016 00:39:42 +0000 (00:39 +0000)]
Merge "Remove btif dependency on libmedia"
Jakub Pawlowski [Tue, 20 Dec 2016 00:27:03 +0000 (00:27 +0000)]
Expose Bluetooth 5.0 properties to JNI
am:
e0750ca056
Change-Id: I36c42f3209131f6f7390f9bff40fe3ccdc41e618
Jakub Pawlowski [Sun, 18 Dec 2016 01:08:15 +0000 (17:08 -0800)]
Modernize BLE Scanner implementation (2/3)
Get rid of BTA state machine states for BLE scanning.
Test: sl4a FilteringTest
Bug:
30622771
Change-Id: I8a879604f413c9980cf64983d8ef6b9a94669295
Jakub Pawlowski [Mon, 19 Dec 2016 22:43:58 +0000 (22:43 +0000)]
Use LE Extended Advertising Report Event when available
am:
801db30048
Change-Id: Ic0d6126c8a246586a178d2d6cc32db6252377277
Jakub Pawlowski [Mon, 19 Dec 2016 22:43:56 +0000 (22:43 +0000)]
Use extended set scan enable/parameters when available
am:
9df2a552f7
Change-Id: I0b023b25ef5a6badf086ad8ef181dfc7bbbc0d60
Jakub Pawlowski [Mon, 19 Dec 2016 22:43:54 +0000 (22:43 +0000)]
Update BleAdvertiserHciInterface
am:
699888256f
Change-Id: Ic4c440c567fa8bd1a8ae25a8fe97d2420d9d223c
Jakub Pawlowski [Mon, 19 Dec 2016 22:43:52 +0000 (22:43 +0000)]
Handle Advertising Set Terminated event
am:
751381c64f
Change-Id: I08d19566b74bb13571334b1165b0ffa97b0c47ec
Jakub Pawlowski [Mon, 19 Dec 2016 22:43:51 +0000 (22:43 +0000)]
Advertising Extension Implementation
am:
5af96d3fda
Change-Id: I75e806c6f8616e03f321d4fea55833bd73aed275
Jakub Pawlowski [Mon, 19 Dec 2016 22:29:41 +0000 (22:29 +0000)]
BLE scan filter setup simplification (2/3)
am:
7098432166
Change-Id: If6ff7b9ef3b075b2e170cc96a1066aa7783d377d
Jakub Pawlowski [Mon, 5 Dec 2016 19:46:23 +0000 (11:46 -0800)]
Expose Bluetooth 5.0 properties to JNI
Bug:
30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I6185e6926e7363824aa573c7d65f7ab66f954e52
Jakub Pawlowski [Tue, 13 Dec 2016 00:22:56 +0000 (16:22 -0800)]
Use LE Extended Advertising Report Event when available
Bug:
30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: Id85504922c21f15bc36ac8bb5e4ab962ee356e3d
Jakub Pawlowski [Fri, 2 Dec 2016 19:34:06 +0000 (11:34 -0800)]
Use extended set scan enable/parameters when available
When LE Advertising Extension is available on the controller we must use
both extended advertising and scanning commands. Otherwise, according to
the spec, controller will return error.
This patch makes sure that proper avaliable HCI calls are made.
Bug:
30622771
Test: sl4a ConcurrentBleAdvertisingTest as scanner
Change-Id: I6906c381f0f758bd24b592390a4ef46e7fae36ed
Jakub Pawlowski [Thu, 1 Dec 2016 23:32:58 +0000 (15:32 -0800)]
Update BleAdvertiserHciInterface
This patch updates BleAdvertiserHciInterface to be on pair with
Bluetooth 5.0 LE Advertising Extension feature.
Bug:
30622771
Test: net_test_stack_multi_adv native test
Change-Id: Ie0ec8c7f8ed0d7a874e392123b3486c767121140
Jakub Pawlowski [Wed, 30 Nov 2016 21:51:01 +0000 (13:51 -0800)]
Handle Advertising Set Terminated event
Make BleAdvertiserHciExtendedImpl report when advertising set is
disabled because of new connection.
Bug:
30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: Ic13a31fe4bb92f121a29d540274d13893775a450
Jakub Pawlowski [Tue, 29 Nov 2016 17:26:16 +0000 (09:26 -0800)]
Advertising Extension Implementation
This patch implements current BleAdvertiserHciInterface using LE
Advertising extension HCI commands.
Bug:
30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: Icaaf24d6d02d8a887b3bb57d5b858b929f11c413
Jakub Pawlowski [Fri, 16 Dec 2016 18:43:49 +0000 (10:43 -0800)]
BLE scan filter setup simplification (2/3)
Bug:
30622771
Test: sl4a BleScanTest
Change-Id: I55e6c201849a057995c0c6fda1c52af826749922
Sanket Agarwal [Mon, 19 Dec 2016 21:32:45 +0000 (21:32 +0000)]
AVRCP CT: Register for UUIDS Changed
am:
d008a8a618
Change-Id: I3a5e3cbc86264ba97b1bc42d728ce0969828d2ce
Sanket Agarwal [Mon, 19 Dec 2016 19:15:00 +0000 (11:15 -0800)]
AVRCP CT: Register for UUIDS Changed
-- Also fix a bug introduced by change of data types in AVRCP Open state
and AVRCP Browse Open state. Due to change in data type and field
mismatch the status value was being read incorrectly
Bug: b/
33750053
Test: Manual test of browse connect
Test: PTS test for UUIDs changed
Change-Id: Ifecf9480a3fabeee8ad8302ebb7cd48f5322dea7
Jack He [Sun, 18 Dec 2016 00:29:00 +0000 (16:29 -0800)]
Remove btif dependency on libmedia
* btif uses AudioTrack from frameworks/av which is under libaudioclient
* Current dependency on libmedia is incorrect as it is an indirect
dependency to libaudioclient
Bug:
33718447
Test: code compilation, no user visible effect
Change-Id: I7c44095cd282fabf8595015910670193077c1514
Jack He [Sat, 17 Dec 2016 02:47:44 +0000 (02:47 +0000)]
Merge "Add unit tests and refactor LE legacy pairing key distribution methods"
am:
3c5a9b0a96
Change-Id: Iecfcf3007e94d7c94c6be528fb880e65f4235453
Treehugger Robot [Sat, 17 Dec 2016 02:34:14 +0000 (02:34 +0000)]
Merge "Add unit tests and refactor LE legacy pairing key distribution methods"
Jakub Pawlowski [Sat, 17 Dec 2016 01:26:14 +0000 (01:26 +0000)]
Refactor LE scanning HAL (2/3)
am:
83f1d967df
Change-Id: I269498529b2131e0f878dab0752ebde01518d262
Sanket Agarwal [Fri, 16 Dec 2016 22:38:11 +0000 (22:38 +0000)]
Incoming HF connection: CB interaction between BTA <-> BTIF
am:
6664b2ccbb
Change-Id: Icb1484cbbb48b1ba163cc105b01e3ab1085b090c
Jakub Pawlowski [Wed, 14 Dec 2016 17:49:38 +0000 (09:49 -0800)]
Refactor LE scanning HAL (2/3)
This patch converts btgatt_scanner_interface_t struct into
BleScannerInterface class. It also refactors three most important
methods from this interface: RegisterAdvertiser, Scan, and Unregister.
Rest of this interface will be updated in following patches.
Bug:
30622771
Test: sl4a BleScanApiTest
Change-Id: Ie35356f6c3c4f5488514ef55a48a32c93fb21b83
Sanket Agarwal [Thu, 15 Dec 2016 22:47:29 +0000 (14:47 -0800)]
Incoming HF connection: CB interaction between BTA <-> BTIF
For incoming connections we are not storing the handles in BTIF which
implies that BTIF ignores the message (and so does jni -> java). This is
fixed by sending the handle as part of BTA message on incoming accept.
Other bugs include connection from remote (incoming) and disconnecting
from host. They also depended on not storing the handle properly in
first place.
Bug: b/
33555377
Bug: b/
30984220
Test: Manual testing of incoming connections
Change-Id: I84950d42aba2d2c975ea86cc8217fd0129cc90e9
Myles Watson [Fri, 16 Dec 2016 19:30:15 +0000 (19:30 +0000)]
test_vendor: Use pipe2 to set pipe flags
am:
15915b1415
Change-Id: Ic82220e63914ea67ba25ac2c5c7d86da9bb57428
Jack He [Thu, 15 Dec 2016 10:48:33 +0000 (02:48 -0800)]
Add unit tests and refactor LE legacy pairing key distribution methods
* Add unit test for confirm (c1), p1, and p2
* Refactor the code to reduce number of methods
* Refactor c1's code to make it testable
Bug:
32413756
Test: Code compilation, Unit Test, PTS SM Tests
Change-Id: I5cc876b7dd2b21a0780ac9a5236420223df6cddb
Myles Watson [Fri, 16 Dec 2016 16:13:07 +0000 (08:13 -0800)]
test_vendor: Use pipe2 to set pipe flags
Simplify the code to fix a typo. F_SETFD should have been
F_SETFL.
Test: run unit tests
out/host/linux-x86/nativetest/test-vendor_test_host/test-vendor_test_host \
--gtest_filter=AsyncManagerSocketTest.*
Change-Id: I215381d6e130428acae7d73d80fefc97cbf64651
Jack He [Fri, 16 Dec 2016 18:11:52 +0000 (18:11 +0000)]
Merge "Replace assert with CHECK from base/logging.h"
am:
e1fbea9695
Change-Id: I1641fac8690ba1d7c9752e6e6d5b12a06aafe158
Myles Watson [Fri, 16 Dec 2016 18:11:41 +0000 (18:11 +0000)]
test_vendor: Add more unit tests for async_manager
am:
bed69b9bcd
Change-Id: I5a12ec77d46e119d7cff0fce9973972aaa5435f4
Treehugger Robot [Fri, 16 Dec 2016 18:07:46 +0000 (18:07 +0000)]
Merge "Replace assert with CHECK from base/logging.h"
Myles Watson [Thu, 8 Dec 2016 22:34:20 +0000 (14:34 -0800)]
test_vendor: Add more unit tests for async_manager
Test: run the unit tests
out/host/linux-x86/nativetest/test-vendor_test_host/test-vendor_test_host \
--gtest_filter=AsyncManagerSocketTest.*
Change-Id: I8c5e05c5506a067a6148d54dc23bbb931ad612e7
Jack He [Tue, 13 Dec 2016 09:59:12 +0000 (01:59 -0800)]
Replace assert with CHECK from base/logging.h
* Replace assert with CHECK
* Remove all NDEBUG definitions
* Remove hacks for BT_LIBCHROME_NDEBUG
* Removed some removed directories from Makefile such as hcis, brcm, rpc
Coccinelle-assisted:
@@
@@
- #include "base/logging.h"
+ #include <base/logging.h>
@ assert_included @
@@
@ base_logging_included @
@@
@ depends on (assert_included && !(base_logging_included)) @
@@
- #include <assert.h>
+ #include <base/logging.h>
@ depends on (assert_included && base_logging_included) @
@@
- #include <assert.h>
@@
expression E;
@@
- assert(E);
+ CHECK(E);
And a bash script:
for file in $(find . -name "*.cc"); do
spatch --sp-file replace_assert_with_CHECK.cocci --in-place $file
done
The following files are maually edited:
btif/src/btif_config.cc
btif/src/btif_avrcp_audio_track.cc
btif/src/btif_gatt_client.cc
osi/src/data_dispatcher.cc
osi/src/reactor.cc
osi/src/thread.cc
osi/src/fixed_queue.cc
osi/src/list.cc
osi/src/allocation_tracker.cc
osi/src/alarm.cc
osi/test/wakelock_test.cc
Bug:
31781465
Test: Code compilation, Unit Tests, BtStressTest, BtFunhausMetricsTest
Change-Id: I21dc10a45be31665e41441b75b0515ed87523988
Jakub Pawlowski [Fri, 16 Dec 2016 05:53:06 +0000 (05:53 +0000)]
BTA Application registration refactor
am:
221e9bf6c9
Change-Id: I731c9a69bdd9513ee95e77b28e1308049c3fede0
Jack He [Fri, 16 Dec 2016 01:40:11 +0000 (01:40 +0000)]
Change the parameter type of smp_debug_print_nbyte_little_endian
am:
648d513fd6
Change-Id: Iae6d0a4bf665f2d2ec9f6cb1bb92d19ad96c6c79
Jakub Pawlowski [Thu, 15 Dec 2016 22:35:15 +0000 (14:35 -0800)]
BTA Application registration refactor
This patch replace BTA state machine state associated with registration
of new application, together with BTA_GATTC_API_REG_EVT, and
tBTA_GATTC_API_REG. Instead, it uses closure to post registration task,
and callback for registration event.
Bug:
30622771
Test: sl4a ConcurrentBleAdvertiserTest GattConnectTest
Change-Id: I62d68485170ef5472237d62b285353f2c9bc8250
Jack He [Thu, 15 Dec 2016 18:56:55 +0000 (10:56 -0800)]
Change the parameter type of smp_debug_print_nbyte_little_endian
* This function used to take (const uint8_t*) as the second parameter
and it causes all its calls to cast a (const char*) to this type
* This patch changes it to (const char*) so no cast needed
Coccinelle-assisted:
@ rule1 @
type T;
expression A, B, C;
@@
smp_debug_print_nbyte_little_endian(A,
- (T)
B, C);
and
for file in $(find . -name "*.cc"); do
spatch --sp-file refactor_smp_print_func.cocci --in-place $file
done
Bug:
33663033
Test: code compilation, no user visible effect
Change-Id: Ibeed0b414514acc4a8e94e47e99117bdb3e454ff
Ajay Panicker [Thu, 15 Dec 2016 07:06:11 +0000 (07:06 +0000)]
Remove unused function definitions
am:
a57ce82732
Change-Id: Iea1768bc878afbace66ae9ee34e0b98ce2f6f9e0
Ajay Panicker [Tue, 29 Nov 2016 01:40:09 +0000 (17:40 -0800)]
Remove unused function definitions
Test: Code still compiles
Change-Id: I4a86cd3b515ad3da8f852f024952e3f7a85d1071
Jakub Pawlowski [Wed, 14 Dec 2016 05:11:29 +0000 (05:11 +0000)]
Remove unused btm_set_random_address
am:
29aa1e5c56
Change-Id: I8cb98bb23b0c2d1cd2bc434d80360bfac5d6663b
Jakub Pawlowski [Wed, 14 Dec 2016 02:33:14 +0000 (18:33 -0800)]
Remove unused btm_set_random_address
Bug:
30622771
Test: compilation test
Change-Id: I0e502fb9b5b2cc3ccad0aa142a0ec9fedea7d1df
Jakub Pawlowski [Wed, 14 Dec 2016 00:27:43 +0000 (00:27 +0000)]
LE Extended Advertising
am:
1f4cc6dc61
Change-Id: Ia2dc056717bb24c0c87c3b480401efb91c2ab585
Jakub Pawlowski [Mon, 28 Nov 2016 19:16:04 +0000 (11:16 -0800)]
LE Extended Advertising
This patch checks if LE Extended Advertising, and LE Periodic Advertising
features are supported. Also if they are supported, it will read number of
avaliable advertisers, and maximum advertisement data size supported by
controller.
Bug:
30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: Iabfda3dd081519ed70c99eb4290667e10790e047
Pavlin Radoslavov [Tue, 13 Dec 2016 23:48:58 +0000 (23:48 +0000)]
Replace usage of "vector<>" with "std::vector<>"
am:
b324a8d0b7
Change-Id: I4bcc8920020ccd506d944c58c39c701f41848772
Pavlin Radoslavov [Sat, 10 Dec 2016 01:50:59 +0000 (17:50 -0800)]
Replace usage of "vector<>" with "std::vector<>"
This change is needed so we can remove the last instances
of "using std::vector" statements in hardware/libhardware.
Test: code compilation
Change-Id: I6a9fc62152371d1bba6ead71e7ff8c2610799637
Jack He [Tue, 13 Dec 2016 21:40:21 +0000 (21:40 +0000)]
Remove unnecessary error message in PORT_DataInd
am:
d5d8020ed9
Change-Id: I181d269d79ea04c94ead1987bc19636b93a31c36
Jack He [Wed, 7 Dec 2016 02:29:15 +0000 (18:29 -0800)]
Remove unnecessary error message in PORT_DataInd
* Removed unnecessary error message in PORT_DataInd
* Removed unnecessary spaces
* Reformat the code a little bit
Bug:
33398566
Test: code compilation as there is no functional change
Change-Id: I6f4b16f3fd3bdbb58aa09d1548a96f1289124cd3
Jakub Pawlowski [Mon, 12 Dec 2016 22:02:52 +0000 (22:02 +0000)]
Get rid of selective connection procedure
am:
83211b0ccc
Change-Id: If2c20564be5018e0ad14dcc4a13847737645c31b
Jakub Pawlowski [Wed, 7 Dec 2016 19:25:15 +0000 (11:25 -0800)]
Get rid of selective connection procedure
Bug:
30622771
Test: compilation test
Change-Id: I1a7e4c49f93f11a350b96ffe7b2e69974ed82f46
Jakub Pawlowski [Mon, 12 Dec 2016 21:37:35 +0000 (21:37 +0000)]
Simplify LE Advertising Report Event processing
am:
9e3005684f
Change-Id: I83f7a6647fce61bfa1f86244b683a053ee0afe36
Jakub Pawlowski [Mon, 12 Dec 2016 21:37:22 +0000 (21:37 +0000)]
Fix UUID comparision when enabling HID protocol mode for LE devices
am:
33c633ee6e
Change-Id: Ibf91fb0ee93ab79601d343421f8a328b5b4fa32c
Emil Lenngren [Mon, 12 Dec 2016 21:37:11 +0000 (21:37 +0000)]
Fix maximum connections reached for BLE
am:
af7f49c96e
Change-Id: I73e9666a74964d52926979ac779600a5a17830fd
Jakub Pawlowski [Wed, 7 Dec 2016 18:54:44 +0000 (10:54 -0800)]
Simplify LE Advertising Report Event processing
Bug:
30622771
Test: compiliation test
Change-Id: I78ac958b62462dc7aa322336c047670eec6bda0f
Jakub Pawlowski [Sat, 10 Dec 2016 22:20:18 +0000 (14:20 -0800)]
Fix UUID comparision when enabling HID protocol mode for LE devices
Change-Id: Ie635b3b763db5da25e58d7366c2438df67438a81
Emil Lenngren [Mon, 12 Dec 2016 18:47:12 +0000 (18:47 +0000)]
Fix maximum connections reached for BLE
There was a patch some time ago:
https://android.googlesource.com/platform/system/bt/+/
24adb37e4106bf8544c7729d34451fdf2777c4dc
But that patch assumes the error code sent is Connection Rejected Due
To Limited Resources. Most controllers however send Connection Limit
Exceeded, which is more correct. This patch accept both error codes.
Change-Id: Ifead1718cfecb4d6f73c668b5ea743cc68fdaf73
Signed-off-by: Emil Lenngren <emil.lenngren@gmail.com>
Jorge E. Moreira [Mon, 12 Dec 2016 19:44:05 +0000 (19:44 +0000)]
Merge "test-vendor: Fixed a race condition on the destructor of AsyncManager."
am:
329149ed6d
Change-Id: I8ff1673ef915152a24f03760509ccfad24b2f3cd
Treehugger Robot [Mon, 12 Dec 2016 19:34:29 +0000 (19:34 +0000)]
Merge "test-vendor: Fixed a race condition on the destructor of AsyncManager."
Jorge E. Moreira [Sat, 10 Dec 2016 23:11:30 +0000 (15:11 -0800)]
test-vendor: Fixed a race condition on the destructor
of AsyncManager.
Test: Run the unit tests
Change-Id: Icfbaf96b40f10f57e7c925422985ed7004adea64
Jack He [Mon, 12 Dec 2016 18:39:26 +0000 (18:39 +0000)]
Remove extern "C" from header files
am:
ad1e23d50e
Change-Id: Id1364a05d0f7c0a03eb7744eb60b2e413320e5b1
Jack He [Sat, 10 Dec 2016 01:42:28 +0000 (17:42 -0800)]
Remove extern "C" from header files
Since change 290046, most files in system/bt is compiled as C++ source.
Therefore, there is no longer a need for the extern "C" wrapper around
includes that export symbols from those sources.
The following python script is applied to each file in the directory:
front = '#ifdef\s+__cplusplus\s+extern\s+"C"\s+{\s+#endif\s+'
back = '#ifdef\s+__cplusplus\s+}\s+#endif'
with open(sys.argv[1], "r") as f:
data = f.read()
data = re.sub(front, "", data)
data = re.sub(back, "", data)
print data
through a shell script:
for file in $(find . -name "*.h"); do
python remove_cpp_extern_c.py $file > tmp
cat tmp > $file
rm tmp
done
with following files not edited:
* stack/include/a2dp_*
* include/bt_trace.h
* embdrv/sbc/*
Bug:
33492510
Test: Code compilation, BtFunhausMetricsTest, BtStressTest
Change-Id: Iac21cdfb1924b50478dd0b82326e092602cbc9d4
Sanket Agarwal [Fri, 9 Dec 2016 23:22:20 +0000 (23:22 +0000)]
Write unit test for bta/btif HF client role
am:
bd3ae7cbf1
Change-Id: I1f50f0ea7a661171e4547b7cc51cda9c8a66c5db
Sanket Agarwal [Wed, 7 Dec 2016 21:39:02 +0000 (13:39 -0800)]
Write unit test for bta/btif HF client role
Also fix a bug discovered by unit tests:
bdcmp returns 0 on success hence use negation
Bug: b/
30984220
Test: Unit test
Change-Id: I37f7c71c5dd809e4df3d8c2c79906a74c2b19d34
Ajay Panicker [Thu, 8 Dec 2016 22:48:37 +0000 (22:48 +0000)]
Merge "Remove additional usages of UINT_TO_PTR"
am:
06a47fe07c
Change-Id: I41e7a129f56cd5075f64debaaaa91d830d56c969
Treehugger Robot [Thu, 8 Dec 2016 22:43:07 +0000 (22:43 +0000)]
Merge "Remove additional usages of UINT_TO_PTR"