OSDN Git Service
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
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:09:28 +0000 (08:09 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth"
am:
b85d405374
Change-Id: Iea39edaa3c6294001384597a151906aacf423980
Ajay Panicker [Thu, 22 Sep 2016 01:32:33 +0000 (01:32 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth"
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
Andre Eisenbach [Thu, 15 Sep 2016 22:16:33 +0000 (22:16 +0000)]
Add .clang-format am:
99a236f01a am:
9517717f5a
am:
1e697983c7
Change-Id: I5f9dad2c9799e12019cfd52c1172904b7e621782
Myles Watson [Thu, 15 Sep 2016 22:13:24 +0000 (22:13 +0000)]
Merge "Update the style guide" am:
02b83686b6
am:
7d7513c991
Change-Id: Ib297112c2cb827948914b5a3aecf8d7552277aed
Andre Eisenbach [Thu, 15 Sep 2016 22:13:24 +0000 (22:13 +0000)]
Add .clang-format am:
99a236f01a
am:
9517717f5a
Change-Id: I9c6f0b19e349a5de2f5c2fb79848ff7c738af28e
Myles Watson [Thu, 15 Sep 2016 22:12:46 +0000 (22:12 +0000)]
Merge "Update the style guide"
am:
02b83686b6
Change-Id: Idd4299419cb9326577478bc60e86ee53f571dc0c
Andre Eisenbach [Thu, 15 Sep 2016 22:10:56 +0000 (22:10 +0000)]
Add .clang-format
am:
99a236f01a
Change-Id: I83b914993265bf0c7f2a3dd17437a60feaef38f9
Treehugger Robot [Thu, 15 Sep 2016 22:09:32 +0000 (22:09 +0000)]
Merge "Update the style guide"
Andre Eisenbach [Wed, 14 Sep 2016 21:32:49 +0000 (14:32 -0700)]
Add .clang-format
Change-Id: I3750edd23be239d1b19aa1b7d949cfa3d074cb2f
Jakub Pawlowski [Thu, 15 Sep 2016 22:00:18 +0000 (22:00 +0000)]
Fix NPE in l2cble_notify_le_connection am:
b4458c93d5 am:
2049c27daf
am:
59b67c9d1e
Change-Id: I99280ae406d22116c5238b635ec3999b2d70ebc6
Jakub Pawlowski [Thu, 15 Sep 2016 22:00:17 +0000 (22:00 +0000)]
Merge "Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT" am:
2d8048d72f am:
8445951ea7
am:
4c25ffc226
Change-Id: I7474bc3b19514d1a3f684dbf6961422948a108e0
Jakub Pawlowski [Thu, 15 Sep 2016 21:55:52 +0000 (21:55 +0000)]
Fix NPE in l2cble_notify_le_connection am:
b4458c93d5
am:
2049c27daf
Change-Id: I9c25ed898755346d67592e6fb6ec11e7fcf4b19f
Jakub Pawlowski [Thu, 15 Sep 2016 21:55:51 +0000 (21:55 +0000)]
Merge "Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT" am:
2d8048d72f
am:
8445951ea7
Change-Id: Id88abcd5a6ded1fccb58dafec19d694e7bab9b05
Jakub Pawlowski [Thu, 15 Sep 2016 21:53:07 +0000 (21:53 +0000)]
Fix NPE in l2cble_notify_le_connection
am:
b4458c93d5
Change-Id: I4d4e647734515a2364b69afb31ca838725d014b8
Jakub Pawlowski [Thu, 15 Sep 2016 21:53:07 +0000 (21:53 +0000)]
Merge "Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT"
am:
2d8048d72f
Change-Id: Ie0e87e60834c9223b4a5ee338f7aa157f8b37095
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
Treehugger Robot [Thu, 15 Sep 2016 21:41:57 +0000 (21:41 +0000)]
Merge "Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT"
Pavlin Radoslavov [Thu, 15 Sep 2016 21:00:43 +0000 (21:00 +0000)]
Merge "Add BT_HCI_UNKNOWN_MESSAGE_TYPE log event" am:
c94437561f am:
65677c9331
am:
2ae0370526
Change-Id: I5a2bd8ca09cb78f3e419fc8a30bf28a53e6c707d
Pavlin Radoslavov [Thu, 15 Sep 2016 20:58:01 +0000 (20:58 +0000)]
Merge "Add BT_HCI_UNKNOWN_MESSAGE_TYPE log event" am:
c94437561f
am:
65677c9331
Change-Id: I3efa81485765b7dec9a5f4482be802ae75efdbd2
Pavlin Radoslavov [Thu, 15 Sep 2016 20:55:31 +0000 (20:55 +0000)]
Merge "Add BT_HCI_UNKNOWN_MESSAGE_TYPE log event"
am:
c94437561f
Change-Id: Id78a7d380b1a1cbedecec73d26b9d41067211d74
Treehugger Robot [Thu, 15 Sep 2016 20:35:41 +0000 (20:35 +0000)]
Merge "Add BT_HCI_UNKNOWN_MESSAGE_TYPE log event"
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
Myles Watson [Thu, 15 Sep 2016 16:19:10 +0000 (09:19 -0700)]
Update the style guide
Add a pointer to the C++ style guide.
Add a HOWTO for those who have outstanding patches that
they'd like to reformat.
Change-Id: Ia749c6498424cfbdf0bb759a1736978f91a34289
Jakub Pawlowski [Thu, 15 Sep 2016 13:44:01 +0000 (13:44 +0000)]
Don't use move in FOR_EACH_* macro am:
10c37e63c1 am:
f004056a16
am:
98baa0c9c3
Change-Id: Icdbbe9d1205924b56a8143cb7546a50e1ceb2254
Jakub Pawlowski [Thu, 15 Sep 2016 13:41:30 +0000 (13:41 +0000)]
Don't use move in FOR_EACH_* macro am:
10c37e63c1
am:
f004056a16
Change-Id: I432ada61603549998900fac1a27713ebab2a50dc
Jakub Pawlowski [Thu, 15 Sep 2016 13:38:30 +0000 (13:38 +0000)]
Don't use move in FOR_EACH_* macro
am:
10c37e63c1
Change-Id: Ieb71b05695a6e362aab1f79aa8d83e520bd70321
Jakub Pawlowski [Thu, 15 Sep 2016 11:04:37 +0000 (04:04 -0700)]
Don't use move in FOR_EACH_* macro
FOR_EACH_* macros are resolved to for loop. Using std::move inside it
will cause already moved object to be used when more than one observer
is registered. This patch fixes that.
This issue was already fixed in commit
e84c4bd, but was reintroduced in
a641b6fa.
Change-Id: I14b72371d369e4bdcaf3a6e30045bf8a1e8c3e1b
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
Andre Eisenbach [Wed, 14 Sep 2016 23:05:02 +0000 (23:05 +0000)]
Merge "Add security record for devices found through LE batch scan" am:
c8bd6de515 am:
11f412019a
am:
6f27f44943
Change-Id: I6931a53171e65d06232c6bf959a21a73837774eb
Andre Eisenbach [Wed, 14 Sep 2016 22:09:07 +0000 (22:09 +0000)]
Merge "Add security record for devices found through LE batch scan" am:
c8bd6de515
am:
11f412019a
Change-Id: I3b5a3b051f9a312ee8b573d7b79c97492cf1e8f6
Andre Eisenbach [Wed, 14 Sep 2016 22:06:06 +0000 (22:06 +0000)]
Merge "Add security record for devices found through LE batch scan"
am:
c8bd6de515
Change-Id: If593628632df3b60b2906de10f830fed464661be
Treehugger Robot [Wed, 14 Sep 2016 22:02:25 +0000 (22:02 +0000)]
Merge "Add security record for devices found through LE batch scan"
Myles Watson [Wed, 14 Sep 2016 21:11:02 +0000 (21:11 +0000)]
test_vendor: Remove unnecessary const from params am:
354a9bf886 am:
4a0b6e0ede
am:
fdc7f4722d
Change-Id: I93a831017114937102de7ecdeaa8d9dd7ed2b875
Myles Watson [Wed, 14 Sep 2016 21:08:08 +0000 (21:08 +0000)]
test_vendor: Remove unnecessary const from params am:
354a9bf886
am:
4a0b6e0ede
Change-Id: I442db44dd7d8355bcd009783d55848cf9153d681
Myles Watson [Wed, 14 Sep 2016 21:04:32 +0000 (21:04 +0000)]
test_vendor: Remove unnecessary const from params
am:
354a9bf886
Change-Id: Idd092ebf7c1a97ffa816bd60bf3ee451252b3a75
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
Myles Watson [Wed, 14 Sep 2016 18:39:33 +0000 (11:39 -0700)]
test_vendor: Remove unnecessary const from params
Change-Id: I6502e3e78f139722bb887640dcc00ee79f1b0044
Pavlin Radoslavov [Wed, 14 Sep 2016 05:22:01 +0000 (05:22 +0000)]
Removed unused local variable am:
ac59fa20a7 am:
b77127c06c
am:
c312916c5e
Change-Id: If1be5e2bb12d952b2e74423d4273d08c230d37ea
Pavlin Radoslavov [Wed, 14 Sep 2016 05:19:01 +0000 (05:19 +0000)]
Removed unused local variable am:
ac59fa20a7
am:
b77127c06c
Change-Id: Ie7d8f0dac5b69f7042531493a502b8f5549adf67
Pavlin Radoslavov [Wed, 14 Sep 2016 05:16:30 +0000 (05:16 +0000)]
Removed unused local variable
am:
ac59fa20a7
Change-Id: I365c7c4c9575120c9363e971f8cd85b3235cbc3d
Pavlin Radoslavov [Wed, 14 Sep 2016 05:00:53 +0000 (22:00 -0700)]
Removed unused local variable
Change-Id: Iee7a951351448f07c5e4c92d3b034e5a8377cf5f
Greg Kaiser [Tue, 13 Sep 2016 23:08:06 +0000 (23:08 +0000)]
avrc: Fix AVRC_MsgReq() msg_mask bug am:
ebfeca0a62 am:
b2a6393982
am:
4d4b7bda7a
Change-Id: I651e29d98d9dd85ece0b0cda4d863ff9c2f9a332
Greg Kaiser [Tue, 13 Sep 2016 23:05:35 +0000 (23:05 +0000)]
avrc: Fix AVRC_MsgReq() msg_mask bug am:
ebfeca0a62
am:
b2a6393982
Change-Id: Ic0a573f023dffb2b2e210dea87ec6eedece45c39
Greg Kaiser [Tue, 13 Sep 2016 23:02:36 +0000 (23:02 +0000)]
avrc: Fix AVRC_MsgReq() msg_mask bug
am:
ebfeca0a62
Change-Id: I45dc17b9e45d8cdabcf1c546d63988bf048a54a2
Pavlin Radoslavov [Tue, 13 Sep 2016 20:59:16 +0000 (20:59 +0000)]
A2DP related API update and cleanup am:
d7ff47cc64 am:
d63b36d26c
am:
0e9e125e54
Change-Id: I8346c4fea35433fed9c70e5c6376a77cb5e64029
Pavlin Radoslavov [Tue, 13 Sep 2016 20:48:29 +0000 (20:48 +0000)]
A2DP related API update and cleanup am:
d7ff47cc64
am:
d63b36d26c
Change-Id: I079650e31dac9a5aa44392db3a04012cd269591a
Pavlin Radoslavov [Tue, 13 Sep 2016 20:45:00 +0000 (20:45 +0000)]
A2DP related API update and cleanup
am:
d7ff47cc64
Change-Id: Ie71c7ca4a6c4666dffb31b74516f324ba0f5a267
Greg Kaiser [Tue, 13 Sep 2016 15:07:04 +0000 (08:07 -0700)]
avrc: Fix AVRC_MsgReq() msg_mask bug
msg_mask is intended to be a bit field. But by declaring it a
bool, we end up turning all bit values into 1, and losing the
other bit values. We fix this by properly declaring this as
a uint8_t.
Bug:
31273148
Change-Id: Id95e1853ea1ad4fbebc35fdc24708765f1fd9e07
Pavlin Radoslavov [Thu, 8 Sep 2016 18:27:46 +0000 (11:27 -0700)]
A2DP related API update and cleanup
* Added new A2DP API and use it as appropriate
- A2D_GetTrackFrequency()
- A2D_GetTrackChannelCount()
- A2D_GetNumberOfSubbands()
- A2D_GetNumberOfBlocks()
- A2D_GetAllocationMethodCode()
- A2D_GetChannelModeCode()
- A2D_GetSamplingFrequencyCode()
- A2D_GetSinkTrackChannelType()
- A2D_GetSinkFramesCountToProcess()
* Added corresponding unit tests for the new API
Also, A2DP related cleanup:
- Renamed A2D_sbc_dump_codec_info to A2D_DumpCodecInfoSbc()
- Changed the order of tA2D_SBC_CIE.min_bitpool and
tA2D_SBC_CIE.max_bitpool to reflect the order of the corresponding
fields in the Bluetooth spec (A2DP spec v1.3, page 21).
- Added new API A2D_GetMediaType() and the corresponding unit test
- Renamed AVDT_MEDIA_AUDIO to AVDT_MEDIA_TYPE_AUDIO
- Renamed tA2D_SBC_CIE.alloc_mthd to alloc_method
- Renamed A2D_BAD_ALLOC_MTHD to A2D_BAD_ALLOC_METHOD
- Renamed A2D_NS_ALLOC_MTHD to A2D_NS_ALLOC_METHOD
- Eliminated usage of A2D_MEDIA_TYPE_AUDIO and replace it with
AVDT_MEDIA_TYPE_AUDIO.
Now the media_type value everywhere is the AVDT_MEDIA_TYPE_* value
without the reserved 4 bits (LSBs).
- Fixed macro defines in file "stack/avdt/avdt_defs.h"
Bug:
30958229
Change-Id: Id82653e9c9460aeb92d942a9179bb5abdb4bfdec
Jakub Pawlowski [Tue, 13 Sep 2016 10:25:43 +0000 (10:25 +0000)]
Fix advertising timers am:
a8fcd684da am:
b029c039e6
am:
1dd7300d9b
Change-Id: I84099678a7f691525251e437785f1a9864955817