OSDN Git Service
Andre Eisenbach [Thu, 29 Sep 2016 00:26:14 +0000 (17:26 -0700)]
Merge commit '
7e701dbd4375ee00c3b72d4bda970d444f20c470' into manual_merge_7e701db
Change-Id: I12e74839725fe33e6739517e454a0941aa4bd986
Andre Eisenbach [Wed, 28 Sep 2016 23:53:42 +0000 (23:53 +0000)]
Fix 100 LE device connection limitation
am:
013c32bf98
Change-Id: I64d57c1a19e41bcf35569eb707f58d31c9a54d63
Jakub Pawlowski [Wed, 28 Sep 2016 21:30:31 +0000 (21:30 +0000)]
Separate the definition of BTM layer types from control blocks am:
dc3c1f2afa am:
f7af15140a
am:
b5a4a143de
Change-Id: Ifc520da330610371c16e2d1b5e418f1ecfff8b02
Jakub Pawlowski [Wed, 28 Sep 2016 21:27:02 +0000 (21:27 +0000)]
Separate the definition of BTM layer types from control blocks am:
dc3c1f2afa
am:
f7af15140a
Change-Id: I328bc6141dcc895530b93dca2981bd4bfeeb3da1
Jakub Pawlowski [Wed, 28 Sep 2016 21:24:01 +0000 (21:24 +0000)]
Separate the definition of BTM layer types from control blocks
am:
dc3c1f2afa
Change-Id: Iea26880f80f623744cd96b40c27188428b7d9860
Jakub Pawlowski [Wed, 28 Sep 2016 16:02:39 +0000 (09:02 -0700)]
Separate the definition of BTM layer types from control blocks
Right now, data types, control blocks, and functions used in the BTM
layer are defined in the same header files. This means that if someone
wants to write a test that uses those data types, they must also define
all control blocks, or compile the whole module.
This patch separates the data types from other definitions. Thanks to
it, we will be able to write unit tests, once other dependencies get
separated.
Change-Id: Ibc089e273cc37642fbb8672964b266c20f8d825d
Andre Eisenbach [Wed, 28 Sep 2016 01:07:58 +0000 (18:07 -0700)]
Fix 100 LE device connection limitation
Currently after 100 devices are added to the device security database,
any subsequent LE connection to a newly discovered LE device address
will fail as entries in the security record database are not reused.
This patch removes a device record if the device itself is removed and
also ensures that the oldest device security record is deleted if the
limit is reached to ensure a new record can be allocated.
Bug:
31625900
Change-Id: I22f6c82c64a9a9bfb2a16d79182903e5aa011355
Jakub Pawlowski [Tue, 27 Sep 2016 18:48:00 +0000 (18:48 +0000)]
Use better callbacks in LE multi advertising am:
0a009c382f am:
2f7dd70c11
am:
1127103c3b
Change-Id: Ib24640b13cb8c2f4978b05ce68ebba106be89238
Jakub Pawlowski [Tue, 27 Sep 2016 18:45:37 +0000 (18:45 +0000)]
Use better callbacks in LE multi advertising am:
0a009c382f
am:
2f7dd70c11
Change-Id: Id0d07632d059a984dc350b69f8548aad88b61a3c
Jakub Pawlowski [Tue, 27 Sep 2016 18:42:32 +0000 (18:42 +0000)]
Use better callbacks in LE multi advertising
am:
0a009c382f
Change-Id: Ia9e39fe19443641b6d17cc8e78e8156b5304619f
Jakub Pawlowski [Tue, 6 Sep 2016 14:42:36 +0000 (07:42 -0700)]
Use better callbacks in LE multi advertising
Right now, LE multi advertising related code uses it's own
implementation of queue on top of static array. Use std::queue, and
base::Callback instead.
Changing function pointers to base::Callback instances is required for
further refactoring, which will turn this code into class.
Bug:
30622771
Test: sl4a BleAdvertiseApiTest ConcurrentBleAdvertisingTest
Change-Id: I839e036c6edb4e19a17def4d68d351296468f88c
Jakub Pawlowski [Tue, 27 Sep 2016 15:58:05 +0000 (15:58 +0000)]
Fix unnecessary error message during GATT discovery am:
f2e3bea844
am:
7edffcd474 -s ours
Change-Id: Ic99ab24d1000f5f9fbd75f937d9675d96bfac57e
Jakub Pawlowski [Tue, 27 Sep 2016 15:44:34 +0000 (15:44 +0000)]
Fix unnecessary error message during GATT discovery
am:
f2e3bea844
Change-Id: Ied4363b52980f4a1e146c6186ffe920770f65866
Jakub Pawlowski [Tue, 27 Sep 2016 15:39:34 +0000 (15:39 +0000)]
Update BUILD.gn files am:
29796eb6de am:
d42287dd61
am:
59a4789cd8
Change-Id: I089264ea9600e498df77c2f01df9f851c70c3c79
Jakub Pawlowski [Tue, 27 Sep 2016 15:36:04 +0000 (15:36 +0000)]
Update BUILD.gn files am:
29796eb6de
am:
d42287dd61
Change-Id: Ic0c3dfae0e723d55ea53feb8c024579e66dbb443
Jakub Pawlowski [Tue, 27 Sep 2016 15:33:33 +0000 (15:33 +0000)]
Update BUILD.gn files
am:
29796eb6de
Change-Id: I41391c0764e9def86ff32e72e65222e0c3f6043f
Jakub Pawlowski [Tue, 27 Sep 2016 15:21:55 +0000 (08:21 -0700)]
Update BUILD.gn files
Jakub Pawlowski [Mon, 26 Sep 2016 21:05:18 +0000 (14:05 -0700)]
Fix unnecessary error message during GATT discovery
Bug:
31637098
Change-Id: Ib2545e7827bd338d2e22c88836818fce23e7a057
Nitin Arora [Sat, 24 Sep 2016 00:34:44 +0000 (00:34 +0000)]
Bluetooth: Prevent gatt DB copy if server cache is absent am:
c695f2578d am:
1b85fb000a
am:
ec5ff3d956
Change-Id: I0c6e040a8b9e8256e55145a8b929fb99d77135c4
Nitin Arora [Sat, 24 Sep 2016 00:32:37 +0000 (00:32 +0000)]
Bluetooth: Prevent gatt DB copy if server cache is absent am:
c695f2578d
am:
1b85fb000a
Change-Id: If0b5f4f2e397cf269ed25b684eacf5ea3fb65e51
Nitin Arora [Sat, 24 Sep 2016 00:31:06 +0000 (00:31 +0000)]
Bluetooth: Prevent gatt DB copy if server cache is absent
am:
c695f2578d
Change-Id: Ic25dfb446c5133823523e3b707177739d1296a9a
Nitin Arora [Thu, 14 Jul 2016 01:02:03 +0000 (18:02 -0700)]
Bluetooth: Prevent gatt DB copy if server cache is absent
In case the server cache does not exist for a specific
connection, the API used to copy the server DB into the
DB structure needs to return immediately. This change
makes sure of that and prevents dereferencing of a null
block causing the runtime error.
Change-Id: Iec3040a1280ef9d80b1b9c76eca8071dff499411
Jakub Pawlowski [Fri, 23 Sep 2016 21:06:40 +0000 (21:06 +0000)]
Merge "Convert BLE multi-advertising code to C++" am:
6cbb6f8c37 am:
b2d733b15b
am:
0f174ee3a8
Change-Id: I8198ec8bb793e675bc6d3673e4d58d784d7fd8dd
Jakub Pawlowski [Fri, 23 Sep 2016 21:04:40 +0000 (21:04 +0000)]
Merge "Convert BLE multi-advertising code to C++" am:
6cbb6f8c37
am:
b2d733b15b
Change-Id: I33565f33735b1143a8c6971aed4a25e2ce71a924
Jakub Pawlowski [Fri, 23 Sep 2016 21:02:40 +0000 (21:02 +0000)]
Merge "Convert BLE multi-advertising code to C++"
am:
6cbb6f8c37
Change-Id: I917c9c38fafc5b8a4e537c89038e5bdd056e7c4c
Jakub Pawlowski [Fri, 23 Sep 2016 20:53:24 +0000 (20:53 +0000)]
Merge "Convert BLE multi-advertising code to C++"
chaoyu.x.wu [Fri, 23 Sep 2016 20:00:06 +0000 (20:00 +0000)]
Fix the BLE connection failure with some mice am:
58c27b48aa
am:
1b97714aa8
Change-Id: I3cd24bae9b2015b7776d9b4aad96f643344cfcc4
chaoyu.x.wu [Fri, 23 Sep 2016 19:56:34 +0000 (19:56 +0000)]
Fix the BLE connection failure with some mice
am:
58c27b48aa
Change-Id: I45bdf4a316fca554c8c85cefdb87cff0cd2d21e6
Ajay Panicker [Fri, 23 Sep 2016 19:17:32 +0000 (19:17 +0000)]
Merge "Move btsnoop_hci.log to /data/misc/bluetooth/logs" am:
b64d604c0c am:
271a06c67d
am:
f5c6c7b801
Change-Id: I66fe55ba8ba938e097a321921a29abc4f40cf791
Ajay Panicker [Fri, 23 Sep 2016 19:15:32 +0000 (19:15 +0000)]
Merge "Move btsnoop_hci.log to /data/misc/bluetooth/logs" am:
b64d604c0c
am:
271a06c67d
Change-Id: I7f27d2f0bd6b0bf303e570cc376d90397a36d390
Ajay Panicker [Fri, 23 Sep 2016 19:13:32 +0000 (19:13 +0000)]
Merge "Move btsnoop_hci.log to /data/misc/bluetooth/logs"
am:
b64d604c0c
Change-Id: I87d5ef9224da76d569c2e4b32782f839686590df
Ajay Panicker [Fri, 23 Sep 2016 19:00:17 +0000 (19:00 +0000)]
Merge "Move btsnoop_hci.log to /data/misc/bluetooth/logs"
Jakub Pawlowski [Mon, 5 Sep 2016 11:31:34 +0000 (04:31 -0700)]
Convert BLE multi-advertising code to C++
This patch converts btm_ble_multi_adv.c file to .cc. It also separate
header definitions from rest of BTM layer. It is another step towards
making BLE advertising-related code testable.
Bug:
30622771
Change-Id: I89965e10fbf773e48176ee19ef613dd0df2fb951
chaoyu.x.wu [Mon, 11 Apr 2016 06:08:48 +0000 (14:08 +0800)]
Fix the BLE connection failure with some mice
If enable the "connection parameters update" during GATT discovery,
it may cause some device connection failure due to connection timeout.
Since the the "connection parameter update" is enabled again when GATT
discovery completed, remove the enable of "connection parameter update"
after SMP complete to fix the issue.
This issue was already fixed in commit
2d41fe1c, but then it was
re-introduced in commit
444a8da8, which also removed comment explaining
the issue, added back in this patch.
Bug:
29060797
Change-Id: I42b0b36056821c30d887484e22bfcbd04ea7ca03
(cherry picked from commit
1ec17e06c73c67592aeda29e0aaa03580fdecce9)
Pavlin Radoslavov [Thu, 22 Sep 2016 23:33:38 +0000 (23:33 +0000)]
Removed usage of A2DP codec_type as a separate field am:
b3e5af36e9 am:
a21c8ebcd9
am:
809d61b769
Change-Id: Id8f093ab2e77b1368d8fc60b41882663eec0da2a
Pavlin Radoslavov [Thu, 22 Sep 2016 23:28:07 +0000 (23:28 +0000)]
Removed usage of A2DP codec_type as a separate field am:
b3e5af36e9
am:
a21c8ebcd9
Change-Id: I12bee5b45667e7e95e94b463050709becd078776
Pavlin Radoslavov [Thu, 22 Sep 2016 23:25:37 +0000 (23:25 +0000)]
Removed usage of A2DP codec_type as a separate field
am:
b3e5af36e9
Change-Id: I886c6b3cbaa9cd1abdfc8340e586f5cd2dc33cc2
chaoyu.x.wu [Thu, 22 Sep 2016 23:17:27 +0000 (23:17 +0000)]
Fix the BLE connection failure with some mice am:
1ec17e06c7 am:
3047313009
am:
de7bd173ea
Change-Id: I38e941f96497a19bdc138cbb6a24c5c1c5de69d7
Ajay Panicker [Thu, 22 Sep 2016 23:17:16 +0000 (23:17 +0000)]
Merge "Fix improper null check when handling rc features" am:
e90972c9f2 am:
025f04f15c
am:
aa9f7f5cec
Change-Id: I7b2dc0e5e0946d2ee1d36571b86332dcc04dc421
chaoyu.x.wu [Thu, 22 Sep 2016 22:54:16 +0000 (22:54 +0000)]
Fix the BLE connection failure with some mice am:
1ec17e06c7
am:
3047313009
Change-Id: I91c3d42d8a00e8b7daa163d648085926868ef725
chaoyu.x.wu [Thu, 22 Sep 2016 21:58:35 +0000 (21:58 +0000)]
Fix the BLE connection failure with some mice
am:
1ec17e06c7
Change-Id: Ib5b03ac545fee9c71ae53d869615a1f0fc155182
Ajay Panicker [Thu, 22 Sep 2016 21:58:18 +0000 (21:58 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth" am:
b85d405374 am:
2c189b27ba
am:
f41808ab56
Change-Id: I3be0afd27e9e395627c68c3338a61eb0f7e7db38
Pavlin Radoslavov [Tue, 20 Sep 2016 21:10:08 +0000 (14:10 -0700)]
Removed usage of A2DP codec_type as a separate field
The value of codec_type can be extracted from the codec_info,
so it is not needed to pass it around as an argument, or keep
it as an field.
Also:
* Added new APIs and the corresponding unit tests:
- A2D_GetPacketTimestamp()
- A2D_BuildCodecHeader() - replacement for bta_av_sbc_bld_hdr()
- A2D_CodecName()
* Replaced tBTA_AV_SEP.codec_type with tBTA_AV_SEP.codec_info
Bug:
30958229
Test: A2DP tested manually. Unit tests included in the CL.
Change-Id: I3bfd4750e8639d77a9938ab3c274c9d6ea859fb6
Ajay Panicker [Wed, 14 Sep 2016 18:46:23 +0000 (11:46 -0700)]
Move btsnoop_hci.log to /data/misc/bluetooth/logs
Bug:
31466840
Change-Id: Ibd8f8b85eb59be8bfbb8a7c83b5935802624a748
chaoyu.x.wu [Mon, 11 Apr 2016 06:08:48 +0000 (14:08 +0800)]
Fix the BLE connection failure with some mice
If enable the "connection parameters update" during GATT discovery,
it may cause some device connection failure due to connection timeout.
Since the the "connection parameter update" is enabled again when GATT
discovery completed, remove the enable of "connection parameter update"
after SMP complete to fix the issue.
This issue was already fixed in commit
2d41fe1c, but then it was
re-introduced in commit
444a8da8, which also removed comment explaining
the issue, added back in this patch.
Bug:
29060797
Change-Id: I42b0b36056821c30d887484e22bfcbd04ea7ca03
Ajay Panicker [Thu, 22 Sep 2016 11:53:45 +0000 (11:53 +0000)]
Merge "Fix improper null check when handling rc features" am:
e90972c9f2
am:
025f04f15c
Change-Id: Ib00b67cf8b74258d31322d5f6c5241c2ed629b28
Ajay Panicker [Thu, 22 Sep 2016 11:23:41 +0000 (11:23 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth" am:
b85d405374
am:
2c189b27ba
Change-Id: Ia6fda2cd85dfdacc60d5d3e5ef7944798802de01
Keizo Mendori [Thu, 22 Sep 2016 09:14:35 +0000 (09:14 +0000)]
Blacklist Motorola Roadster for Absolute Volume am:
e89122a9c9 am:
c3ceceaa8b
am:
27962021e4
Change-Id: I8b931c35b7aa10c95412343544816fcb00f25e71
Ajay Panicker [Thu, 22 Sep 2016 08:21:11 +0000 (08:21 +0000)]
Merge "Fix improper null check when handling rc features"
am:
e90972c9f2
Change-Id: I228b1a0befa5becf1c60ca5eaa4b8b1a1e2292f8
Ajay Panicker [Thu, 22 Sep 2016 08:09:28 +0000 (08:09 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth"
am:
b85d405374
Change-Id: Iea39edaa3c6294001384597a151906aacf423980
Treehugger Robot [Thu, 22 Sep 2016 01:49:03 +0000 (01:49 +0000)]
Merge "Fix improper null check when handling rc features"
Ajay Panicker [Thu, 22 Sep 2016 01:32:33 +0000 (01:32 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth"
Ajay Panicker [Wed, 21 Sep 2016 23:35:00 +0000 (16:35 -0700)]
Fix improper null check when handling rc features
Bug:
31533166
Change-Id: Ia04e9c51280a3e379c0670b39a84eb5a53c5332b
Keizo Mendori [Wed, 21 Sep 2016 23:31:18 +0000 (23:31 +0000)]
Blacklist Motorola Roadster for Absolute Volume am:
e89122a9c9
am:
c3ceceaa8b
Change-Id: I93ea5f243a16bc51471a98ec00d12906566ec4ad
Keizo Mendori [Wed, 21 Sep 2016 22:08:29 +0000 (22:08 +0000)]
Blacklist Motorola Roadster for Absolute Volume
am:
e89122a9c9
Change-Id: Id7753a999d4e7c283c901c1eb9a80666f5dda767
Keizo Mendori [Wed, 8 Jun 2016 02:40:43 +0000 (11:40 +0900)]
Blacklist Motorola Roadster for Absolute Volume
Motorola Roadster is advertizing Absolute Volume but it has a
buggy implementation.
Bug:
29740052
Change-Id: I18c1a2f03617669138be2e7e1d9c7bb391cd1129
Pavlin Radoslavov [Tue, 20 Sep 2016 22:08:24 +0000 (22:08 +0000)]
Merge changes from topics 'bt-only-pcm-media-feeding-format', 'bt-a2d-sbc-cie-localize' am:
ab8facfc57 am:
81cb76fb97
am:
1dc15ff2c1
Change-Id: I1febbea4d47b5d6b7b2724802bfd7bf0f6750bd6
Pavlin Radoslavov [Tue, 20 Sep 2016 22:08:22 +0000 (22:08 +0000)]
Use only PCM as the media feeding format am:
c66edf3144 am:
53775d4418
am:
67b773ea4c
Change-Id: I1ab9ecfaafb45da89435ea3426c2c0be890c01ad
Pavlin Radoslavov [Tue, 20 Sep 2016 22:08:20 +0000 (22:08 +0000)]
Localize the usage of tA2D_SBC_CIE only within the SBC codec am:
b18f03ecb0 am:
6e7b4a0473
am:
16a9ecca55
Change-Id: I0360f69027763370f26ded5ffc9f9193123b69e7
Pavlin Radoslavov [Tue, 20 Sep 2016 21:07:31 +0000 (21:07 +0000)]
Merge changes from topics 'bt-only-pcm-media-feeding-format', 'bt-a2d-sbc-cie-localize' am:
ab8facfc57
am:
81cb76fb97
Change-Id: Ia137673125cda68dd7e56e4bd0923d4365177dc2
Pavlin Radoslavov [Tue, 20 Sep 2016 21:07:26 +0000 (21:07 +0000)]
Use only PCM as the media feeding format am:
c66edf3144
am:
53775d4418
Change-Id: I4f3f437523db58793837bd447646c558d07c49a5
Pavlin Radoslavov [Tue, 20 Sep 2016 21:07:18 +0000 (21:07 +0000)]
Localize the usage of tA2D_SBC_CIE only within the SBC codec am:
b18f03ecb0
am:
6e7b4a0473
Change-Id: I86b799afc473b34d6b4c3dc604edd3f062fdf93e
Pavlin Radoslavov [Tue, 20 Sep 2016 20:56:06 +0000 (20:56 +0000)]
Merge changes from topics 'bt-only-pcm-media-feeding-format', 'bt-a2d-sbc-cie-localize'
am:
ab8facfc57
Change-Id: If307b1c892e394e0d273ce346f4b57fff0164068
Pavlin Radoslavov [Tue, 20 Sep 2016 20:56:05 +0000 (20:56 +0000)]
Use only PCM as the media feeding format
am:
c66edf3144
Change-Id: I053b54f9306b607f9cef3a94511b60c7815939b6
Pavlin Radoslavov [Tue, 20 Sep 2016 20:56:04 +0000 (20:56 +0000)]
Localize the usage of tA2D_SBC_CIE only within the SBC codec
am:
b18f03ecb0
Change-Id: I0aee46e8312931fa3a67f893682340dcea00ff1d
Treehugger Robot [Tue, 20 Sep 2016 20:29:39 +0000 (20:29 +0000)]
Merge changes from topics 'bt-only-pcm-media-feeding-format', 'bt-a2d-sbc-cie-localize'
* changes:
Use only PCM as the media feeding format
Localize the usage of tA2D_SBC_CIE only within the SBC codec
Jorge E. Moreira [Tue, 20 Sep 2016 19:36:21 +0000 (19:36 +0000)]
test_vendor: Use kInvalidTaskId in the controller am:
6d835905f0 am:
0a13ce1357
am:
cfe54809a3
Change-Id: I70811f225f9567a05ebfb26dc15215c6729728a0
Jorge E. Moreira [Tue, 20 Sep 2016 19:28:26 +0000 (19:28 +0000)]
test_vendor: Use kInvalidTaskId in the controller am:
6d835905f0
am:
0a13ce1357
Change-Id: Ieb65c009d7fa96bc057f9f54e052fe14ff6f22c6
Jorge E. Moreira [Tue, 20 Sep 2016 19:25:56 +0000 (19:25 +0000)]
test_vendor: Use kInvalidTaskId in the controller
am:
6d835905f0
Change-Id: I45669e742ef1e9241a5f708bbfb9253f534cbb9a
Pavlin Radoslavov [Fri, 16 Sep 2016 00:50:18 +0000 (17:50 -0700)]
Use only PCM as the media feeding format
* Removed field tA2D_AV_MEDIA_FEEDINGS.format, because we always
use/assume the feeding format is PCM.
* Removed tA2D_AV_MEDIA_FEED_CFG_PCM, tA2D_AV_MEDIA_FEED_CFG,
tA2D_AV_CODEC_PCM, and tA2D_AV_CODEC_NONE, because they are not
needed/used anymore.
* Removed feeding mode:
- tBTIF_MEDIA_INIT_AUDIO_FEEDING.feeding_mode
- tBTIF_AV_FEEDING_MODE, BTIF_AV_FEEDING_ASYNCHRONOUS,
BTIF_AV_FEEDING_SYNCHRONOUS
- tBTIF_MEDIA_CB.feeding_mode
* Added new APIs and the corresponding unit tests:
- A2D_CodecConfigMatchesCapabilities()
- A2D_BuildSinkConfig()
- A2D_CodecEquals()
- A2D_CodecRequiresReconfig()
Also:
* Removed header file btif/include/btif_av_api.h because it is not
needed anymore.
* Removed functions or typedefs that are unused or replaced:
- bta_av_co_audio_codec_match() -> replaced by
A2D_CodecConfigMatchesCapabilities()
- bta_av_co_audio_codec_cfg_matches_caps()
- bta_av_co_audio_peer_reset_config()
- bta_av_co_audio_discard_config()
- bta_av_co_get_codec_info()
- bta_av_co_peer_cp_supported()
- tA2D_AV_CODEC_ID
- tBTIF_AV_CODEC_INFO
* Increased the sampling_freq storage from uint16_t to uint32_t
* Decreased the number of channels n_channels storage from uint16_t
to uint8_t
* Removed unneessary global function declarations inside btif_av_co.h
* Changed the order of the A2D_BuildSrc2SinkConfig() arguments, so
the order is more intuitive.
* Misc other cleanup:
- file bta_av_co.cc: code simplification, renamed snk -> sink,
Removed unnecessary cast-away of a const argument: bta_av_co_cp_scmst
Renamed/updated bta_av_co_audio_peer_supports_codec() ->
bta_av_co_find_peer_sink_supports_codec()
Renamed/updated bta_av_co_audio_peer_src_supports_codec() ->
bta_av_co_find_peer_src_supports_codec()
Bug:
30958229
Test: A2DP tested manually. Unit tests included in the CL.
Change-Id: I60981c62b1a88491b5232c4f6515933c4261fac9
Ajay Panicker [Tue, 20 Sep 2016 18:43:03 +0000 (11:43 -0700)]
Remove net_bt_stack group and replace it with bluetooth
Bug:
31549206
Change-Id: I10504d73a962dde583ddb5771cb0a0fe6ca6d580
Jorge E. Moreira [Mon, 19 Sep 2016 22:58:16 +0000 (15:58 -0700)]
test_vendor: Use kInvalidTaskId in the controller
Test: make test-vendor
Change-Id: I6eefd385ecb992f854544ca92c5a8559b6f281f0
Pavlin Radoslavov [Tue, 13 Sep 2016 22:02:52 +0000 (15:02 -0700)]
Localize the usage of tA2D_SBC_CIE only within the SBC codec
* Added new A2DP API and use it as appropriate
- A2D_IsValidCodec()
- A2D_CodecTypeEquals()
- A2D_GetMinBitpool()
- A2D_GetMaxBitpool()
* Removed A2D_GetDefaultConfigSbc(), because it is not needed anymore.
* Removed bta_av_co_audio_get_sbc_config() and replaced it
with code that is not SBC codec-specific:
bta_av_co_audio_encoder_init() and bta_av_co_audio_encoder_update()
* Removed bta_av_co_get_remote_bitpool_pref() because it is
not used/needed anymore.
* Moved the following declarations the a2d_sbc.h header file to
the a2d_sbc.c codec-specific implementation, because they don't need
to be exposed anymore.
- struct tA2D_SBC_CIE
- function A2D_BldSbcInfo()
- function A2D_ParsSbcInfo()
* Added corresponding unit tests for the new API
Bug:
30958229
Test: A2DP tested manually. Unit tests included in the CL.
Change-Id: Ib242956c303f0ca3c5f70ebc00416a7a45e70228
Jakub Pawlowski [Mon, 19 Sep 2016 19:45:05 +0000 (19:45 +0000)]
Fix gatt_server_old service added logic am:
aeafd3967e am:
8be9b3d28e
am:
f60824f0af
Change-Id: I3f26af8221e84fe1a57f1426fae88669becfa456
Jakub Pawlowski [Mon, 19 Sep 2016 19:41:30 +0000 (19:41 +0000)]
Fix gatt_server_old service added logic am:
aeafd3967e
am:
8be9b3d28e
Change-Id: I158409732203edad26d52fc41d3e47e5f8f8e6d2
Jakub Pawlowski [Mon, 19 Sep 2016 19:38:32 +0000 (19:38 +0000)]
Fix gatt_server_old service added logic
am:
aeafd3967e
Change-Id: Id59e5f407a7f30542ed75554ab877ec5686bb71f
Jakub Pawlowski [Mon, 19 Sep 2016 17:38:20 +0000 (10:38 -0700)]
Fix gatt_server_old service added logic
Bug:
31274906
Change-Id: Ifb4ee2a5f1ebcc14e2e1b60caa2fe6536d20946b
Pavlin Radoslavov [Fri, 16 Sep 2016 21:58:25 +0000 (21:58 +0000)]
Add BT_HCI_UNKNOWN_MESSAGE_TYPE log event am:
e1c8ed17c7
am:
881c5faeec
Change-Id: Ic540a9d0d526632628ee49d03442e813c898e33e
Pavlin Radoslavov [Fri, 16 Sep 2016 21:55:29 +0000 (21:55 +0000)]
Add BT_HCI_UNKNOWN_MESSAGE_TYPE log event
am:
e1c8ed17c7
Change-Id: Ie4625f75dcfd71ae9740af80721a53be19045055
Pavlin Radoslavov [Wed, 14 Sep 2016 23:39:02 +0000 (16:39 -0700)]
Add BT_HCI_UNKNOWN_MESSAGE_TYPE log event
If the received HCI type is unknown, then log an event and abort.
The most likely reason for that to happen is if the UART stream
is corrupted. We cannot recover from that, and there is not much
else we can do.
Also, fixed a bug in an HCI-related unit test that was exposed
by the above change.
Bug:
31432127
Change-Id: Ia888c485f177af4962268bf8f593b27fd7a4b080
(cherry picked from commit
27ec0c7824cf67b8a36bf5391734e6d2fc6207e2)
Jakub Pawlowski [Fri, 16 Sep 2016 21:08:42 +0000 (21:08 +0000)]
Fix bad address type assumption am:
1e688824d9
am:
9a6155ca74
Change-Id: I85ebce9e26b63c2dfdcd97276b48a617aff04b15
Andre Eisenbach [Fri, 16 Sep 2016 21:08:30 +0000 (21:08 +0000)]
Merge "Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT" into nyc-mr1-dev am:
654c6d13e5
am:
dcef080aa4
Change-Id: I7f3442860102e19a5ae123679355f6e1f928225b
Jakub Pawlowski [Fri, 16 Sep 2016 21:08:16 +0000 (21:08 +0000)]
Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT am:
5f98c2410f
am:
7b50114544 -s ours
Change-Id: Ia8d1d7f59400279fb95c6011582f35fc16e9c3da
Jakub Pawlowski [Fri, 16 Sep 2016 20:12:16 +0000 (20:12 +0000)]
Fix NPE in l2cble_notify_le_connection am:
5e61112a98
am:
f3451bf180
Change-Id: Ic5b842253aaaf4ef85804c1f4d8fbbae37017bfd
Jakub Pawlowski [Fri, 16 Sep 2016 20:10:23 +0000 (20:10 +0000)]
Fix bad address type assumption
am:
1e688824d9
Change-Id: I522a7131368106919866b6f764eff43927a86124
Andre Eisenbach [Fri, 16 Sep 2016 20:09:59 +0000 (20:09 +0000)]
Merge "Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT" into nyc-mr1-dev
am:
654c6d13e5
Change-Id: I4ca7da856ba68edb44f9fd251d4f333590c98def
Jakub Pawlowski [Fri, 16 Sep 2016 20:09:59 +0000 (20:09 +0000)]
Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT
am:
5f98c2410f
Change-Id: Ic93722a25b865313ef94fcd84a7008b737f8a567
Jakub Pawlowski [Fri, 16 Sep 2016 20:09:44 +0000 (20:09 +0000)]
Fix NPE in l2cble_notify_le_connection
am:
5e61112a98
Change-Id: I6fbb661a7911c22b51952bfd54f5b342c9cb6b75
Jakub Pawlowski [Fri, 16 Sep 2016 15:03:16 +0000 (08:03 -0700)]
Fix bad address type assumption
LE related code should not use BTM_ACL_IS_CONNECTED, because it assumes
classic transport.
In this particular case, connection created event, which was result of
advertising, caused cancellation of "LE Create Connection".
Attempt to send "LE Create Connection Cancel" was checking if connection
is already established, but was failing to do so becuase
BTM_ACL_IS_CONNECTED was used instead of btm_bda_to_acl with proper
transport. This caused just created connection to be dropped.
Bug:
31442085
Change-Id: Ia345a3d00e8567160f4abb2a31c4130ee69d67a3
(cherry picked from commit
f5566938ba671329d91c84c30ab126fbcdfc16d7)
Andre Eisenbach [Fri, 16 Sep 2016 19:56:58 +0000 (19:56 +0000)]
Merge "Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT" into nyc-mr1-dev
Andre Eisenbach [Fri, 16 Sep 2016 17:40:53 +0000 (17:40 +0000)]
Add security record for devices found through LE batch scan am:
b4a5ec958f
am:
3502a0a2ba
Change-Id: I6135cf3463a7cfece356f34a1bf8d59b2b145d0e
Jakub Pawlowski [Thu, 15 Sep 2016 15:02:05 +0000 (08:02 -0700)]
Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT
Cancelling discovery was not handled properly in
btif_dm_search_services_evt and was causing crashes due to assert in
default case.
Bug:
31442085
Change-Id: If9a2c203730c9b06df5ff8d8e251f0c35addcb82
(cherry picked from commit
7df43240c4a7cf5ecd58a39f03d235bf52929d79)
Jakub Pawlowski [Thu, 15 Sep 2016 15:04:04 +0000 (08:04 -0700)]
Fix NPE in l2cble_notify_le_connection
Accessing p_lcb must be guarded with NULL check.
Bug:
31442085
Change-Id: I0f6e3f8e0247c5e8946c4d098f8a3ba442f5fb28
(cherry picked from commit
b4458c93d5b5d7e2c103166d71daff560ee1a978)
Andre Eisenbach [Fri, 16 Sep 2016 17:29:19 +0000 (17:29 +0000)]
Add security record for devices found through LE batch scan
am:
b4a5ec958f
Change-Id: I361aef8e79a9ef470b7e38bc71a30cf9104fa09f
Jakub Pawlowski [Fri, 16 Sep 2016 17:20:48 +0000 (17:20 +0000)]
Fix bad address type assumption am:
f5566938ba am:
7e427be59b
am:
3ef323192e
Change-Id: I7d21aa394a496045bd9c44e2eb25133fc5e21777
Jakub Pawlowski [Fri, 16 Sep 2016 17:17:47 +0000 (17:17 +0000)]
Fix bad address type assumption am:
f5566938ba
am:
7e427be59b
Change-Id: I27d13a1cda73fb33952b2bc12fea3b1fb4825bb9
Jakub Pawlowski [Fri, 16 Sep 2016 17:15:48 +0000 (17:15 +0000)]
Fix bad address type assumption
am:
f5566938ba
Change-Id: Ib3bc8b2e8299960ead6c9b6f7969df8453300431
Jakub Pawlowski [Fri, 16 Sep 2016 15:03:16 +0000 (08:03 -0700)]
Fix bad address type assumption
LE related code should not use BTM_ACL_IS_CONNECTED, because it assumes
classic transport.
In this particular case, connection created event, which was result of
advertising, caused cancellation of "LE Create Connection".
Attempt to send "LE Create Connection Cancel" was checking if connection
is already established, but was failing to do so becuase
BTM_ACL_IS_CONNECTED was used instead of btm_bda_to_acl with proper
transport. This caused just created connection to be dropped.
Bug:
31442085
Change-Id: Ia345a3d00e8567160f4abb2a31c4130ee69d67a3
Andre Eisenbach [Wed, 14 Sep 2016 19:41:37 +0000 (12:41 -0700)]
Add security record for devices found through LE batch scan
Currently, starting an LE batch scan are not added to the stack internal
device database, which means that the address type and device type
needed for a connection are not available.
This patch ensures that devices found during an LE scan are added to the
device database to ensure connection attempts will succeed.
Bug:
31309376
Change-Id: Ic52d7eaa03d17dcbbd848af9140038bc84ea3bd0
(cherry picked from commit
e0295e2c2eb7cc6eb331d581ed8455d6b30b3bc6)
Myles Watson [Thu, 15 Sep 2016 22:16:33 +0000 (22:16 +0000)]
Merge "Update the style guide" am:
02b83686b6 am:
7d7513c991
am:
8ca1ca515e
Change-Id: Iadc769f1852598c5e128c0f4c140edbfc4af4313