OSDN Git Service
Matadeen Mishra [Mon, 20 Jun 2016 18:05:13 +0000 (18:05 +0000)]
L2CAP: Handle invalid HCI packets
am:
92e0f19ff0
Change-Id: Ib7ffac0632de84d8f0099eeef3dabbb94a101b7f
Matadeen Mishra [Wed, 3 Feb 2016 12:43:39 +0000 (18:13 +0530)]
L2CAP: Handle invalid HCI packets
- Handled Buffer over flow for uint16_t
- Discard invalid HCI packets from Codenomican test
tool as data length and actual data not matching
during reassembly
Use case:
Execute L2CAP test suit from Defensics Codenomican
Steps:
1. Pair and connect DUT to Codenomican tool
2. Execute L2CAP test suit from Defensics Codenomican
Failure:
Crash observed on DUT and Codenomican tool stuck in execution.
Root cause:
Codenomican tool sending invalid HCI packets to DUT and
there are no checks to handle buffer over flow and other invalid data
from Codenomican tool.
Bug:
29498064
Change-Id: I6f93c80244fc39d607ad285185136bbbca83d7ae
Marie Janssen [Fri, 17 Jun 2016 21:56:30 +0000 (21:56 +0000)]
AVRCP: rename constant AVRC_CTLR_INCLUDED am:
c6d93ada03
am:
da9427f3a4
Change-Id: I45edc918060b1fe487af35b54837168b038c3a15
Marie Janssen [Fri, 17 Jun 2016 21:53:41 +0000 (21:53 +0000)]
AVRCP: rename constant AVRC_CTLR_INCLUDED
am:
c6d93ada03
Change-Id: I11790e7488120b63a9c2080f5db358a099194ff9
Marie Janssen [Fri, 17 Jun 2016 20:13:21 +0000 (13:13 -0700)]
AVRCP: rename constant AVRC_CTLR_INCLUDED
Typo fixed to AVRC_CTRL_INCLUDED
Change-Id: Ib0ac11916bf6e856ae2d3cfb842bd0b8fef56008
Jakub Pawlowski [Fri, 17 Jun 2016 19:30:27 +0000 (19:30 +0000)]
HOGP: Clear pending operations for a given device on connect am:
7c172b7df7
am:
5669f33732
Change-Id: I9c13ef059566a0ed0200059ceedb5c699173e5dd
Jakub Pawlowski [Fri, 17 Jun 2016 19:30:27 +0000 (19:30 +0000)]
HOGP: Preffer write command over write requests am:
4f76028680
am:
0b116c357d
Change-Id: Ib561afa96ec1925a578c500b6046d3471c45f5c4
Jakub Pawlowski [Fri, 17 Jun 2016 19:27:24 +0000 (19:27 +0000)]
HOGP: Clear pending operations for a given device on connect
am:
7c172b7df7
Change-Id: I53fc3a6b886fa522c7b2495fbf3b66e8f7f43751
Jakub Pawlowski [Fri, 17 Jun 2016 19:27:24 +0000 (19:27 +0000)]
HOGP: Preffer write command over write requests
am:
4f76028680
Change-Id: Ia836d6252e7bfdbadcebcc46655eb50e68e4eb8d
Jakub Pawlowski [Fri, 17 Jun 2016 19:25:17 +0000 (19:25 +0000)]
Merge \\"BTIF: remove unnecessary \\'extern \\"C\\"\\'\\" am:
7732b1b052
am:
93cafa4469
Change-Id: I18529dde68abc8aac21fcb7fa048af559351c3c9
Jakub Pawlowski [Fri, 17 Jun 2016 19:22:33 +0000 (19:22 +0000)]
Merge \"BTIF: remove unnecessary \'extern \"C\"\'\"
am:
7732b1b052
Change-Id: I934149b72980ceb2e024e77f02163fe977571a4e
Jakub Pawlowski [Mon, 13 Jun 2016 17:30:17 +0000 (10:30 -0700)]
HOGP: Clear pending operations for a given device on connect
If there are any HID operations scheduled after disconnect, mark the
device as no longer executing after establishing connection. Otherwise
we'll be unable to send any HID commands to it.
Change-Id: Ie1bb622388a3bcb574dec3dde76ef4518ee1102f
(cherry picked from commit
4362b8c559575a83897a5af55202ce2c1d19925c)
Jakub Pawlowski [Tue, 14 Jun 2016 21:40:51 +0000 (14:40 -0700)]
HOGP: Preffer write command over write requests
Some HID devices will accept both write request and write command.
Prefer write commands when possible.
This is due to bug in some hardware, that will not send write response
when too many commands are queued.
Bug:
29184976
Change-Id: I5bafc067f044a48f152c60b8e17722067bc1453e
(cherry picked from commit
af77225c0d7bec06d2417b0305ebcbab04144caa)
Jakub Pawlowski [Fri, 17 Jun 2016 19:12:36 +0000 (19:12 +0000)]
Merge "BTIF: remove unnecessary 'extern "C"'"
Myles Watson [Fri, 17 Jun 2016 01:49:09 +0000 (01:49 +0000)]
Merge \\"test_vendor_lib: refactor packet constructors\\" am:
9e08f85c9b
am:
c853d7a455
Change-Id: I47da0fd502f7774c4ab45d05986bc6c73e64757a
Pavlin Radoslavov [Fri, 17 Jun 2016 01:49:09 +0000 (01:49 +0000)]
Add missing NULL pointers assignments am:
8cbc291080
am:
deb7d2446c
Change-Id: Icae63f38c6196c52ca317634aba25b1aefe77456
Pavlin Radoslavov [Fri, 17 Jun 2016 01:48:40 +0000 (01:48 +0000)]
Add missing NULL pointers assignments
am:
ba64c39c8c
Change-Id: I8657b04da33177dcb714eebc1a8ad17f9510113f
Myles Watson [Fri, 17 Jun 2016 01:46:22 +0000 (01:46 +0000)]
Merge \"test_vendor_lib: refactor packet constructors\"
am:
9e08f85c9b
Change-Id: I8b09b5ca2dd28d2b4ce1343b4cffefe9d5f943d9
Pavlin Radoslavov [Fri, 17 Jun 2016 01:46:22 +0000 (01:46 +0000)]
Add missing NULL pointers assignments
am:
8cbc291080
Change-Id: I0f0d5791508bfc635f8713f85ddfc71e282f606e
Treehugger Robot [Fri, 17 Jun 2016 01:13:14 +0000 (01:13 +0000)]
Merge "test_vendor_lib: refactor packet constructors"
Pavlin Radoslavov [Thu, 16 Jun 2016 23:37:57 +0000 (16:37 -0700)]
Add missing NULL pointers assignments
Each pointer that was freed by one of the following functions should
be reset to NULL:
- config_free()
- data_dispatcher_free()
- fixed_queue_free()
- list_free()
Bug:
29421693
Change-Id: Ie55a04ed986393994564edcf872d7413b0767a85
(cherry picked from commit
8cbc291080730cd7d04990a8fc0e11249b06aa08)
Pavlin Radoslavov [Thu, 16 Jun 2016 23:37:57 +0000 (16:37 -0700)]
Add missing NULL pointers assignments
Each pointer that was freed by one of the following functions should
be reset to NULL:
- config_free()
- data_dispatcher_free()
- fixed_queue_free()
- list_free()
Bug:
29421693
Change-Id: Ie55a04ed986393994564edcf872d7413b0767a85
Jakub Pawlowski [Thu, 16 Jun 2016 00:15:42 +0000 (17:15 -0700)]
BTIF: remove unnecessary 'extern "C"'
btif is all cpp now, with execption to uuid_to_string_legacy
and few methods imported/exported for main module.
There is no need to have c linkage for the rest of it.
Change-Id: I5e7079e1269dc6461b14b665587592270cdf3140
Myles Watson [Thu, 26 May 2016 21:13:42 +0000 (14:13 -0700)]
test_vendor_lib: refactor packet constructors
Make it simpler to append bytes to payloads, since that's a common
operation.
Change-Id: I7fc975fb999add8e1a360b91bdae869d6d7d2029
Signed-off-by: Myles Watson <mylesgw@google.com>
Jakub Pawlowski [Thu, 16 Jun 2016 19:15:00 +0000 (19:15 +0000)]
GATT: don\\'t update link status for apps that were never connected am:
a62adcab30
am:
a26d811fd9
Change-Id: I7c6fd1d6b1b23a7c3f7153f5e52b93efb5dda959
Jakub Pawlowski [Thu, 16 Jun 2016 19:12:20 +0000 (19:12 +0000)]
GATT: don\'t update link status for apps that were never connected
am:
a62adcab30
Change-Id: I084130c52f82ca960badeea1da6573e929cb85ff
Jakub Pawlowski [Thu, 16 Jun 2016 15:16:48 +0000 (08:16 -0700)]
GATT: don't update link status for apps that were never connected
Right now, in GATT_Deregister we make a call to
gatt_update_app_use_link_flag, which might result in a call to
GATT_SetIddleTimeout on links that this client was never connected to.
In order to fix that, we must check if gatt_update_app_hold_link_status
made any changes to p_tcb->app_hold_link. If not, then skip updating
the timer.
Change-Id: I6f18ec7fe4e80e048adc9e360cae703b7d64d62a
Jakub Pawlowski [Thu, 16 Jun 2016 17:37:43 +0000 (17:37 +0000)]
Convert HID and Device Manager BTA code to C++ am:
b7938c1866
am:
e61ca65604
Change-Id: I989305f991be9497f8b8ca0ea47ed1f1d9ec1a79
Jakub Pawlowski [Thu, 16 Jun 2016 17:35:26 +0000 (17:35 +0000)]
Convert HID and Device Manager BTA code to C++
am:
b7938c1866
Change-Id: I9ddcdc2683d63ba84cd5f8e9de044dc78b0d6521
Jakub Pawlowski [Fri, 27 May 2016 00:57:22 +0000 (17:57 -0700)]
Convert HID and Device Manager BTA code to C++
These are the only places that use BTA GATTC API. After this change it's
possible to change GATT API to use C++ types as arguments.
Bug:
28485365
Change-Id: Idf83396f4bc3a2cc8a9b41f69da5d033af1be678
Dan Willemsen [Thu, 16 Jun 2016 00:10:10 +0000 (00:10 +0000)]
Fix unused source warning am:
b172552537
am:
407b1ca7c9
Change-Id: Ia10d88250882be35325ce989234f1bce92593166
Dan Willemsen [Thu, 16 Jun 2016 00:03:00 +0000 (00:03 +0000)]
Fix unused source warning
am:
b172552537
Change-Id: I2c2191358dd60a087cb1d39fa22dd65ab2eb7371
Dan Willemsen [Wed, 15 Jun 2016 22:46:15 +0000 (15:46 -0700)]
Fix unused source warning
These were using the wrong c++ extension, so the build system was not
picking them up.
Change-Id: I3a767a236bca05f04dd069bb1f40796f41cb8b60
Andy Hung [Wed, 15 Jun 2016 21:03:06 +0000 (21:03 +0000)]
Improve BT HAL write response to BT server reads
am:
5952e40bef
Change-Id: I135acb67ba2228cdfc002fa79fd615f1c20d817d
Andy Hung [Wed, 15 Jun 2016 02:58:58 +0000 (19:58 -0700)]
Improve BT HAL write response to BT server reads
By polling, we ensure the socket buffer is nearly always full,
as blocking socket writes may not wake in time to avoid underflow.
Bug:
28286313
Change-Id: I056768dbd860993c41d44c33a4846d62c50db933
Jakub Pawlowski [Wed, 15 Jun 2016 00:33:18 +0000 (00:33 +0000)]
Fix missing GATT Characteristic from last service am:
6c81482c2d
am:
13e3c509be
Change-Id: I51b9ab591f6ff57bb7025f1f92457c33e2f0f9b2
Android Build Merger (Role) [Wed, 15 Jun 2016 00:33:09 +0000 (00:33 +0000)]
Merge "Use UINT16 for GATT attribute id field am:
d407e1afca am:
889db4490c" into nyc-dev-plus-aosp
Jakub Pawlowski [Wed, 15 Jun 2016 00:32:47 +0000 (00:32 +0000)]
Use UINT16 for GATT attribute id field am:
d407e1afca
am:
889db4490c
Change-Id: Idf4905c3aebb7cca12c6c6c8bdfc63a456ae3b68
Jakub Pawlowski [Wed, 15 Jun 2016 00:32:44 +0000 (00:32 +0000)]
Merge \"HOGP: Clear pending operations for a given device on connect\" into nyc-dev
am:
bfbda174b5
Change-Id: Ia026605f6083ad56f0974e092014bbe95a182d7d
Jakub Pawlowski [Wed, 15 Jun 2016 00:30:02 +0000 (00:30 +0000)]
Fix missing GATT Characteristic from last service
am:
6c81482c2d
Change-Id: I1f103942867c539eb97ce4768812558cf3bf9844
TreeHugger Robot [Wed, 15 Jun 2016 00:28:58 +0000 (00:28 +0000)]
Merge "HOGP: Clear pending operations for a given device on connect" into nyc-dev
Jakub Pawlowski [Wed, 15 Jun 2016 00:26:43 +0000 (00:26 +0000)]
Use UINT16 for GATT attribute id field
am:
d407e1afca
Change-Id: I890bc4f7bde854578c837dcc3fb0eaace92e411c
Jakub Pawlowski [Tue, 14 Jun 2016 23:32:10 +0000 (23:32 +0000)]
Merge \"HOGP: Preffer write command over write requests\" into nyc-dev
am:
8577ffca06
Change-Id: I226da0773982a88f030ce29ede2545bab2687ce3
TreeHugger Robot [Tue, 14 Jun 2016 23:28:20 +0000 (23:28 +0000)]
Merge "HOGP: Preffer write command over write requests" into nyc-dev
Jakub Pawlowski [Tue, 14 Jun 2016 23:14:15 +0000 (23:14 +0000)]
Merge \"Use UINT16 for GATT attribute id field\" into nyc-dev
am:
a1d6772787
Change-Id: I1e55b63eb9203b5560fc049f97d6c5f2f2e2d250
Jakub Pawlowski [Tue, 14 Jun 2016 23:12:49 +0000 (23:12 +0000)]
Fix missing GATT Characteristic from last service
am:
552e630435 -s ours
Change-Id: Iae9ab73966cd2f1965343f44ae4d2409161f71a0
Jakub Pawlowski [Tue, 14 Jun 2016 19:23:44 +0000 (12:23 -0700)]
Fix missing GATT Characteristic from last service
GATT Service is contained between start and end handle. If
characteristic definition is at end handle, and it's value definition is
after end handle, it will not be properly discovered. That's because we
use value_handle instead of attribute_handle to identify
characteristics.
As a workaround, increase service boundary if value is defined after
it's definition.
Bug:
29253825
Change-Id: Ib145aea4f5cf38a1fbb977c301136e16f8f900f7
(chery picked from commit
552e630435a68d8f51d458dccf8697c625cf1510)
Jakub Pawlowski [Tue, 14 Jun 2016 22:33:55 +0000 (22:33 +0000)]
Add missing curly braces in clear notification am:
82e2fa17b4
am:
c0ee74dc9a
Change-Id: Ic413e57a60173ca1cb8d9e3390f3b22d4d45e08f
Jakub Pawlowski [Tue, 14 Jun 2016 22:31:06 +0000 (22:31 +0000)]
Add missing curly braces in clear notification
am:
82e2fa17b4
Change-Id: I4185c983b253dcd06dade4e762b304e2594984f0
Jakub Pawlowski [Tue, 14 Jun 2016 19:47:52 +0000 (12:47 -0700)]
Use UINT16 for GATT attribute id field
Id field is equal to attribute handle, so it must be 16bits.
Otherwise only piece of GATT database can be used.
Bug:
29253825
Change-Id: Ia88e3ad3eb96ca8e97349aa5e852e66c57072b49
(cherry picked from commit
e6b1cb43525e27f95de85dc43150d7368b9d4c35)
Jakub Pawlowski [Tue, 14 Jun 2016 22:03:29 +0000 (22:03 +0000)]
Merge "Use UINT16 for GATT attribute id field" into nyc-dev
Jakub Pawlowski [Tue, 14 Jun 2016 21:40:51 +0000 (14:40 -0700)]
HOGP: Preffer write command over write requests
Some HID devices will accept both write request and write command.
Prefer write commands when possible.
This is due to bug in some hardware, that will not send write response
when too many commands are queued.
Bug:
29184976
Change-Id: I5bafc067f044a48f152c60b8e17722067bc1453e
Jakub Pawlowski [Tue, 14 Jun 2016 19:47:52 +0000 (12:47 -0700)]
Use UINT16 for GATT attribute id field
Id field is equal to attribute handle, so it must be 16bits.
Otherwise only piece of GATT database can be used.
Bug:
29253825
Change-Id: Ia88e3ad3eb96ca8e97349aa5e852e66c57072b49
Jakub Pawlowski [Tue, 14 Jun 2016 19:23:44 +0000 (12:23 -0700)]
Fix missing GATT Characteristic from last service
GATT Service is contained between start and end handle. If
characteristic definition is at end handle, and it's value definition is
after end handle, it will not be properly discovered. That's because we
use value_handle instead of attribute_handle to identify
characteristics.
As a workaround, increase service boundary if value is defined after
it's definition.
Bug:
29253825
Change-Id: Ib145aea4f5cf38a1fbb977c301136e16f8f900f7
Jakub Pawlowski [Tue, 14 Jun 2016 16:26:24 +0000 (09:26 -0700)]
Add missing curly braces in clear notification
Change-Id: I59b13486f76735e5dd0c07d57b2671c746169bd8
Jakub Pawlowski [Mon, 13 Jun 2016 17:30:17 +0000 (10:30 -0700)]
HOGP: Clear pending operations for a given device on connect
If there are any HID operations scheduled after disconnect, mark the
device as no longer executing after establishing connection. Otherwise
we'll be unable to send any HID commands to it.
Change-Id: Ie1bb622388a3bcb574dec3dde76ef4518ee1102f
Jakub Pawlowski [Sat, 11 Jun 2016 02:04:26 +0000 (02:04 +0000)]
HOGP: Clear pending operations for a given device on disconnect am:
f978a57103
am:
6818e548cb
Change-Id: Ife41744dba7574aaa462cb0a2ac545d9382544ca
Jakub Pawlowski [Sat, 11 Jun 2016 02:00:24 +0000 (02:00 +0000)]
HOGP: Clear pending operations for a given device on disconnect
am:
f978a57103
Change-Id: Ica1e0caf127e3baccb20075e2f6fd95b1d9c03ba
Jakub Pawlowski [Fri, 10 Jun 2016 23:32:26 +0000 (16:32 -0700)]
HOGP: Clear pending operations for a given device on disconnect
If there are any GATT operations interrupted by a disconnect, mark the
device as no longer executing. Otherwise we'll stil receive data from
the device, but we'll be unable to send any HID commands to it.
Bug:
29184976
Change-Id: I489f41c970abad0ff1145005d3250beafa83d27e
Jakub Pawlowski [Sat, 11 Jun 2016 01:45:26 +0000 (01:45 +0000)]
HOGP: Clear pending operations for a given device on disconnect
am:
22fc38259f
Change-Id: Icac19c9f691843e5df70fdd0051c6d2441bf5582
Jakub Pawlowski [Fri, 10 Jun 2016 23:32:26 +0000 (16:32 -0700)]
HOGP: Clear pending operations for a given device on disconnect
If there are any GATT operations interrupted by a disconnect, mark the
device as no longer executing. Otherwise we'll stil receive data from
the device, but we'll be unable to send any HID commands to it.
Bug:
29184976
Change-Id: I489f41c970abad0ff1145005d3250beafa83d27e
AnubhavGupta [Thu, 9 Jun 2016 23:26:17 +0000 (23:26 +0000)]
Do not request AVRC_CAP_COMPANY_ID if A2DP Sink is not enabled am:
1c512b851d
am:
6f01bc2a6d
Change-Id: I219aad79a41fd9499e040ecf1d551fb6fda058a1
AnubhavGupta [Thu, 9 Jun 2016 23:23:38 +0000 (23:23 +0000)]
Do not request AVRC_CAP_COMPANY_ID if A2DP Sink is not enabled
am:
1c512b851d
Change-Id: Ic30615e2cf916ab2311deb1377d868e3f3a661a7
AnubhavGupta [Thu, 9 Jun 2016 23:21:05 +0000 (23:21 +0000)]
Do not request AVRC_CAP_COMPANY_ID if A2DP Sink is not enabled
am:
470466e6be
Change-Id: If478c20f576e201f3443ae8ae61768f8ba6e80d8
AnubhavGupta [Wed, 6 Apr 2016 06:17:05 +0000 (11:47 +0530)]
Do not request AVRC_CAP_COMPANY_ID if A2DP Sink is not enabled
Also fixed AVRC_PDU_GET_PLAY_STATUS timeout response.
Bug:
28177785
Change-Id: Icde64a5c1806453850abe101f9707fff61566566
(cherry picked from commit
1c512b851d76deac860fce1232e4a1fa1a097f1c)
AnubhavGupta [Wed, 6 Apr 2016 06:17:05 +0000 (11:47 +0530)]
Do not request AVRC_CAP_COMPANY_ID if A2DP Sink is not enabled
Also fixed AVRC_PDU_GET_PLAY_STATUS timeout response.
Bug:
28177785
Change-Id: Icde64a5c1806453850abe101f9707fff61566566
Srinu Jella [Thu, 9 Jun 2016 00:51:00 +0000 (00:51 +0000)]
Set disable timer in case of any active ACL connection
am:
70035577fd
Change-Id: I05c0e02b4149cc8f943612617f5166d3fffafd59
Srinu Jella [Wed, 8 Jun 2016 10:20:53 +0000 (15:50 +0530)]
Set disable timer in case of any active ACL connection
Use Case: Disable time out when atleast one active ACL connections
Steps:
1. Turn ON Bluetooth
2. Connect to any Headset
3. Turn OFF bluetooth.
Failure: Turn OFF bluetooth is failed when atleast one active ACL connections
Root Cause:i If we have one or more active ACL links, so it is not notitying
BTA_DM_DISABLE_EVT to upper layer.
Fix: Set disable timer in case of any active ACL connection
Bug:
29217385
Change-Id: Ica47717119f1ab9fa9f4f5244e8483c408276a2a
(cherry picked from commit
3e4f01ada8c1627bd48f31cd0c8269984b8e5f96)
Myles Watson [Wed, 8 Jun 2016 22:08:44 +0000 (22:08 +0000)]
Merge \"btm: Restrict EXTENDED_INQUIRY_RESULT to 1 result\" into nyc-dev
am:
59bc2de906
Change-Id: I5cefab6f346731ea11085ce613c9c4c95665ba4c
TreeHugger Robot [Wed, 8 Jun 2016 22:03:23 +0000 (22:03 +0000)]
Merge "btm: Restrict EXTENDED_INQUIRY_RESULT to 1 result" into nyc-dev
Srinu Jella [Wed, 8 Jun 2016 19:15:52 +0000 (19:15 +0000)]
Set disable timer in case of any active ACL connection am:
3e4f01ada8
am:
b5d0d36154
Change-Id: I968db4a71934e298d91e8e3815c21d697157efb9
Srinu Jella [Wed, 8 Jun 2016 19:13:14 +0000 (19:13 +0000)]
Set disable timer in case of any active ACL connection
am:
3e4f01ada8
Change-Id: Ia22d37db6f47cf634a6c38a3f169140054b95ee8
Srinu Jella [Wed, 8 Jun 2016 10:20:53 +0000 (15:50 +0530)]
Set disable timer in case of any active ACL connection
Use Case: Disable time out when atleast one active ACL connections
Steps:
1. Turn ON Bluetooth
2. Connect to any Headset
3. Turn OFF bluetooth.
Failure: Turn OFF bluetooth is failed when atleast one active ACL connections
Root Cause:i If we have one or more active ACL links, so it is not notitying
BTA_DM_DISABLE_EVT to upper layer.
Fix: Set disable timer in case of any active ACL connection
Change-Id: Ica47717119f1ab9fa9f4f5244e8483c408276a2a
Subramanian Srinivasan [Wed, 8 Jun 2016 01:33:59 +0000 (01:33 +0000)]
Merge \"Fix payload size for GATT Read by type request\" into nyc-dev
am:
73ee3314ed
Change-Id: I5893f5aa1c551469d17dd0dc556ebafa5c47266c
Venkata Jagadeesh [Wed, 8 Jun 2016 01:33:58 +0000 (01:33 +0000)]
Merge \"Reject L2CAP INFO RSP and ECHO RSP on the LE signaling channel\" into nyc-dev
am:
e67263c5e6
Change-Id: I4856ec39f37afee18bc6d5154bdffe23a57c454d
TreeHugger Robot [Wed, 8 Jun 2016 01:30:28 +0000 (01:30 +0000)]
Merge "Fix payload size for GATT Read by type request" into nyc-dev
Pankaj Kanwar [Wed, 8 Jun 2016 01:28:49 +0000 (01:28 +0000)]
Merge "Reject L2CAP INFO RSP and ECHO RSP on the LE signaling channel" into nyc-dev
Nitin Arora [Wed, 8 Jun 2016 01:05:20 +0000 (01:05 +0000)]
Remote device changes for SMP certification
am:
9ded3b71de
Change-Id: If254bb87236ea88405433ccd88b874e8672fa3dd
Venkata Jagadeesh [Wed, 8 Jun 2016 00:59:29 +0000 (00:59 +0000)]
Merge \\"Reject L2CAP INFO RSP and ECHO RSP on the LE signaling channel\\" am:
fe7f53d6b3
am:
f92afd2378
Change-Id: Ie49e2a2f6f4d0d7751f1d1e378f9753e08d14370
Subramanian Srinivasan [Wed, 8 Jun 2016 00:59:29 +0000 (00:59 +0000)]
Merge \\"Fix payload size for GATT Read by type request\\" am:
89b997468c
am:
556f238bac
Change-Id: I399635806ba80c08019efa7aeb8b4d3566803bd5
Venkata Jagadeesh [Wed, 8 Jun 2016 00:57:05 +0000 (00:57 +0000)]
Merge \"Reject L2CAP INFO RSP and ECHO RSP on the LE signaling channel\"
am:
fe7f53d6b3
Change-Id: Ida2dd0bff8210d63e3aa02f8261a9633352f0204
Subramanian Srinivasan [Wed, 8 Jun 2016 00:57:04 +0000 (00:57 +0000)]
Merge \"Fix payload size for GATT Read by type request\"
am:
89b997468c
Change-Id: I26c3889d95d5e7d0b1b94cbabdbbe91404fd6530
Treehugger Robot [Wed, 8 Jun 2016 00:45:46 +0000 (00:45 +0000)]
Merge "Reject L2CAP INFO RSP and ECHO RSP on the LE signaling channel"
Treehugger Robot [Wed, 8 Jun 2016 00:45:21 +0000 (00:45 +0000)]
Merge "Fix payload size for GATT Read by type request"
Myles Watson [Wed, 8 Jun 2016 00:27:58 +0000 (00:27 +0000)]
btm: Restrict EXTENDED_INQUIRY_RESULT to 1 result am:
1a011544dc
am:
2386dc5177
Change-Id: I506fe9f24710cf212e397b4142052f8a33c0ad6d
Myles Watson [Wed, 8 Jun 2016 00:25:33 +0000 (00:25 +0000)]
btm: Restrict EXTENDED_INQUIRY_RESULT to 1 result
am:
1a011544dc
Change-Id: Ibd967e028594f6cbb64b4040016012fb53bb047d
Subramanian Srinivasan [Fri, 27 May 2016 23:32:55 +0000 (16:32 -0700)]
Fix payload size for GATT Read by type request
Payload size for GATT Read by type request for UUID32 and UUID128
are incorrectly allocated. This leads to memory overflow when
Read by type request is sent for them and eventually results
in crash during free. This change makes sure that the payload
can accomodate upto 128 bit UUID.
This crash is observed while running TC_GAR_CL_BV_03_C Qual test
case.
Bug:
29011042
Change-Id: Ib2b41b769b394670099f4549f204e2972f7df876
(cherry picked from commit
7da98621a4dfa8196b8d20e8955ad508f540e5d9)
Subramanian Srinivasan [Fri, 27 May 2016 23:32:55 +0000 (16:32 -0700)]
Fix payload size for GATT Read by type request
Payload size for GATT Read by type request for UUID32 and UUID128
are incorrectly allocated. This leads to memory overflow when
Read by type request is sent for them and eventually results
in crash during free. This change makes sure that the payload
can accomodate upto 128 bit UUID.
This crash is observed while running TC_GAR_CL_BV_03_C Qual test
case.
Bug:
29011042
Change-Id: Ib2b41b769b394670099f4549f204e2972f7df876
Venkata Jagadeesh [Fri, 27 May 2016 10:06:20 +0000 (15:36 +0530)]
Reject L2CAP INFO RSP and ECHO RSP on the LE signaling channel
Steps:
Execute TC_LE_REJ_BI_02_C
Failure:
PTS stuck after sending INFO RSP, ECHO RSP on the LE signaling channel
Root Cause:
The Bluetooth stack is not rejecting INFO RSP, ECHO RSP even though
these commands are invalid for the LE signaling Channel.
Fix:
Reject the INFO RSP, ECHO RSP with error L2CAP_CMD_REJ_NOT_UNDERSTOOD.
Bug:
27852645
Change-Id: Ie09f658d606206cbdbea928e8cb6d10332743cf4
(cherry picked from commit
d35bb40dd563e7f37df0a2fa9c0f61d0958b9601)
Venkata Jagadeesh [Fri, 27 May 2016 10:06:20 +0000 (15:36 +0530)]
Reject L2CAP INFO RSP and ECHO RSP on the LE signaling channel
Steps:
Execute TC_LE_REJ_BI_02_C
Failure:
PTS stuck after sending INFO RSP, ECHO RSP on the LE signaling channel
Root Cause:
The Bluetooth stack is not rejecting INFO RSP, ECHO RSP even though
these commands are invalid for the LE signaling Channel.
Fix:
Reject the INFO RSP, ECHO RSP with error L2CAP_CMD_REJ_NOT_UNDERSTOOD.
Bug:
27852645
Change-Id: Ie09f658d606206cbdbea928e8cb6d10332743cf4
Myles Watson [Tue, 7 Jun 2016 23:14:18 +0000 (16:14 -0700)]
btm: Restrict EXTENDED_INQUIRY_RESULT to 1 result
The spec only allows one result per event.
Abort processing and return if the spec is not followed.
Bug:
29141745
Change-Id: Ic414b28adadec274779b0d953d12d499a619aff6
Signed-off-by: Myles Watson <mylesgw@google.com>
Myles Watson [Tue, 7 Jun 2016 23:14:18 +0000 (16:14 -0700)]
btm: Restrict EXTENDED_INQUIRY_RESULT to 1 result
The spec only allows one result per event.
Abort processing and return if the spec is not followed.
Bug:
29141745
Change-Id: Ic414b28adadec274779b0d953d12d499a619aff6
Signed-off-by: Myles Watson <mylesgw@google.com>
Nitin Arora [Tue, 15 Mar 2016 22:00:36 +0000 (15:00 -0700)]
Remote device changes for SMP certification
Use Case:
Certification test cases for SMP require various scenarios
where the remote device needs to show a specific behavior
where it fails the pairing in a certain way, and the DUT is
required to abort the pairing properly.
In abcense of a proper PTS suite to execute these test cases,
we can use another device running the same host by configuring
certain run time property.
Test Cases:
TP/SCJW/BI-02-C
TP/SCJW/BV-02-C
TP/SCPK/BI-03-C
TP/SCPK/BI-04-C
TP/SCPK/BV-02-C
TP/SCPK/BV-03-C
TP/SCJW/BI-01-C
TP/SCCT/BV-01-C
TP/SCCT/BV-02-C
TP/SCPK/BI-01-C
TP/SCPK/BI-02-C
TP/SCPK/BV-04-C
TP/SCPK/BV-01-C
Fix:
Added a property in the bt_stack.conf file. The property name
is "SmpFailureCase". The values 2 to 6(inclusive), are forcausing SMP
failures with various failure reasons.
Failure case 1 and 9 are for producing error "Confirm value failure".
Cases 7 and 8 are for generating specific errors at pair cancel.
Note:
The default use of this feature is controlled using a compile
time flag BTM_BLE_SMP_CERTIFICATION.
The BTM_BLE_SMP_CERTIFICATION = TRUE is needed only while we
wait for the PTS support for the LE Secure connections.
Bug:
27852645
Change-Id: I1f7a8ff2659d85b5978b75870c57162a34d394d0
(cherry picked from commit
0bd0c8fc88a7141691a7ca839b11cb711945ee33)
Jakub Pawlowski [Tue, 7 Jun 2016 01:55:15 +0000 (01:55 +0000)]
Fix invalid BDA parameter passing for connection parameter updates am:
3021c5a5aa
am:
68750afdb5
* commit '
68750afdb59191037c651571099f542122f5361f':
Fix invalid BDA parameter passing for connection parameter updates
Change-Id: I7571c6277ccb7142e486b2c1588ab687c2b79a69
Jakub Pawlowski [Tue, 7 Jun 2016 01:50:33 +0000 (01:50 +0000)]
Fix invalid BDA parameter passing for connection parameter updates
am:
3021c5a5aa
* commit '
3021c5a5aac9760e8c4885cbf9c220d1b04dbdb3':
Fix invalid BDA parameter passing for connection parameter updates
Change-Id: I649b1b08ad84056dbdd44ca4258280bc57639215
Jakub Pawlowski [Fri, 3 Jun 2016 22:42:32 +0000 (15:42 -0700)]
Fix invalid BDA parameter passing for connection parameter updates
The BD_ADDR type is not a struct, just an array of bytes. Therefore,
Bind does not know how to store it for later execution, and just stores
the pointer to the first element, which is not valid at time of
execution.
Instead use bt_bdaddr_t, which is a struct. Bind will copy it's content
properly.
Change-Id: I4875aae4d7cbb809821d91a13554b8fdf310a7fe
JivakDhadse [Tue, 7 Jun 2016 00:15:49 +0000 (00:15 +0000)]
Merge "Revert "DO NOT MERGE Proper construction of AVDTP general reject message"" into nyc-dev
am:
a3f785a138
* commit '
a3f785a138ab67c6533de4f427e777c222e4352e':
Revert "DO NOT MERGE Proper construction of AVDTP general reject message"
Change-Id: Ib8b48f4805efa30b46bbfdd3b760ced75a0b7a59
Nitin Arora [Tue, 7 Jun 2016 00:15:47 +0000 (00:15 +0000)]
Merge "Clear BLE block from device records at unpair" into nyc-dev
am:
8c919fb37a
* commit '
8c919fb37a56f3a6a2e30564e1356bf93c468b5a':
Clear BLE block from device records at unpair
Change-Id: I7866ce6a767cc7b2ce5727a8e971f45808c5e2c0
Pankaj Kanwar [Tue, 7 Jun 2016 00:09:01 +0000 (00:09 +0000)]
Merge "Revert "DO NOT MERGE Proper construction of AVDTP general reject message"" into nyc-dev
Pankaj Kanwar [Tue, 7 Jun 2016 00:07:46 +0000 (00:07 +0000)]
Merge "Clear BLE block from device records at unpair" into nyc-dev