OSDN Git Service
Pankaj Kanwar [Wed, 8 Jun 2016 01:36:26 +0000 (01:36 +0000)]
Merge \\"Reject L2CAP INFO RSP and ECHO RSP on the LE signaling channel\\" into nyc-dev am:
e67263c5e6
am:
9d2bd9ea1c
Change-Id: I53b939a73c561039d3101af89eafdf3b7eb6827e
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
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:13:09 +0000 (01:13 +0000)]
Remote device changes for SMP certification am:
9ded3b71de
am:
82fd51249a
Change-Id: I916d548186fca2d449d47c0b8e9b88b410a9db8e
Nitin Arora [Wed, 8 Jun 2016 01:09:15 +0000 (01:09 +0000)]
Remote device changes for SMP certification am:
9ded3b71de
am:
e59ce51b32
Change-Id: Ie96d1187e340f29ed0d050758e01783c1a988c2a
Nitin Arora [Wed, 8 Jun 2016 01:05:20 +0000 (01:05 +0000)]
Remote device changes for SMP certification
am:
9ded3b71de
Change-Id: If254bb87236ea88405433ccd88b874e8672fa3dd
Nitin Arora [Wed, 8 Jun 2016 01:05:07 +0000 (01:05 +0000)]
Remote device changes for SMP certification
am:
9ded3b71de
Change-Id: I94cf61e64d92b8bf2658941059507958c7feec75
Venkata Jagadeesh [Wed, 8 Jun 2016 01:02:07 +0000 (01:02 +0000)]
Merge \\\"Reject L2CAP INFO RSP and ECHO RSP on the LE signaling channel\\\" am:
fe7f53d6b3 am:
f92afd2378
am:
659f7e127c
Change-Id: I81f25a024e406dba8fdcc6c6eb83aee1240a50a7
Subramanian Srinivasan [Wed, 8 Jun 2016 01:02:06 +0000 (01:02 +0000)]
Merge \\\"Fix payload size for GATT Read by type request\\\" am:
89b997468c am:
556f238bac
am:
4424a29276
Change-Id: I993371e007f10942b4314ab4f734b53139c2cf21
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:30:14 +0000 (00:30 +0000)]
btm: Restrict EXTENDED_INQUIRY_RESULT to 1 result am:
1a011544dc am:
2386dc5177
am:
ef636bf93e
Change-Id: I63d9bc3ad660780638b46c227b5016c2840edd29
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
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>
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:56:18 +0000 (01:56 +0000)]
Fix invalid BDA parameter passing for connection parameter updates am:
3021c5a5aa am:
68750afdb5
am:
98aa1e5054
* commit '
98aa1e50548d32910b8504dd85ad42b0c14f4bc6':
Fix invalid BDA parameter passing for connection parameter updates
Change-Id: Icf7d4d96bd5217eaabe82c48602d2275a6e98070
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
Android Build Merger (Role) [Tue, 7 Jun 2016 00:19:06 +0000 (00:19 +0000)]
Merge "Merge "Revert "DO NOT MERGE Proper construction of AVDTP general reject message"" into nyc-dev am:
a3f785a138 am:
aec7794da1" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 7 Jun 2016 00:19:03 +0000 (00:19 +0000)]
Merge "Merge "Clear BLE block from device records at unpair" into nyc-dev am:
8c919fb37a am:
32ce8e33de" into nyc-mr1-dev-plus-aosp
Pankaj Kanwar [Tue, 7 Jun 2016 00:18:56 +0000 (00:18 +0000)]
Merge "Revert "DO NOT MERGE Proper construction of AVDTP general reject message"" into nyc-dev am:
a3f785a138
am:
aec7794da1
* commit '
aec7794da16e2e71398d72a7a1c92d1d071fcdd8':
Revert "DO NOT MERGE Proper construction of AVDTP general reject message"
Change-Id: Iec1b75733d9586926e78e4d98fc735d7824cf507
Pankaj Kanwar [Tue, 7 Jun 2016 00:18:54 +0000 (00:18 +0000)]
Merge "Clear BLE block from device records at unpair" into nyc-dev am:
8c919fb37a
am:
32ce8e33de
* commit '
32ce8e33de6860626a0f3c8e52411286d8caba3b':
Clear BLE block from device records at unpair
Change-Id: I01e7921d52f2b2851e708245064c96d857ce1643
Pankaj Kanwar [Tue, 7 Jun 2016 00:18:41 +0000 (00:18 +0000)]
Merge "Revert "DO NOT MERGE Proper construction of AVDTP general reject message"" into nyc-dev am:
a3f785a138
am:
307c661859
* commit '
307c661859d96375a2e729d4ab0d0afe9f49700a':
Revert "DO NOT MERGE Proper construction of AVDTP general reject message"
Change-Id: I3c1ef2cb010ca0e6dab7c53c5c5917c4a91c2ff3
Pankaj Kanwar [Tue, 7 Jun 2016 00:18:38 +0000 (00:18 +0000)]
Merge "Clear BLE block from device records at unpair" into nyc-dev am:
8c919fb37a
am:
dffd0fd06f
* commit '
dffd0fd06fa5485c7ca8079c4ae316262fdfc35a':
Clear BLE block from device records at unpair
Change-Id: I0a66d262f596f70fed45abbe044ccb707d68dee1
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
JivakDhadse [Tue, 7 Jun 2016 00:15:33 +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: I180dcc5e72104217af72311be8b1eb0bb38464d4
Nitin Arora [Tue, 7 Jun 2016 00:15:32 +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: Iee861ef44ca133bf4d2c0a1604a134d86a8c202d
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
Nitin Arora [Mon, 6 Jun 2016 21:32:07 +0000 (21:32 +0000)]
Remote device changes for SMP certification am:
0bd0c8fc88 am:
a81770e617
am:
c66f648c40
* commit '
c66f648c409a95496db50ba33e97f7b7e1d764e2':
Remote device changes for SMP certification
Change-Id: I78fb4c30bef056f7cf1b3583ebc749cccad99e95
Nitin Arora [Mon, 6 Jun 2016 21:29:52 +0000 (21:29 +0000)]
Remote device changes for SMP certification am:
0bd0c8fc88
am:
a81770e617
* commit '
a81770e617b6f39107f8b1aa0aa519523f94ae39':
Remote device changes for SMP certification
Change-Id: I85f54999363801ddac7a58d89bb31f51e4e3d442
Navin Kochar [Mon, 6 Jun 2016 21:29:28 +0000 (21:29 +0000)]
Fix for issue introduced due to rebase of LE L2CAP COC am:
be3f7f9d24
am:
769fe68f3d
* commit '
769fe68f3dec86b8ae1bce069136b90bedbbe819':
Change-Id: I26e44ca69dbe41afa990a047ee469e4194a37cdd
Nitin Arora [Mon, 6 Jun 2016 21:22:04 +0000 (21:22 +0000)]
Remote device changes for SMP certification
am:
0bd0c8fc88
* commit '
0bd0c8fc88a7141691a7ca839b11cb711945ee33':
Remote device changes for SMP certification
Change-Id: Id8e7028ae84257b6831bb6ae058c1495e63ea10a
Navin Kochar [Mon, 6 Jun 2016 20:32:22 +0000 (20:32 +0000)]
Fix for issue introduced due to rebase of LE L2CAP COC am:
be3f7f9d24
am:
f68f7d227d
* commit '
f68f7d227d1ae2c7bfcc1ff5540fa0654750fa1e':
Fix for issue introduced due to rebase of LE L2CAP COC
Change-Id: I49dbd4aeca95bff55dbb30d1b9e01c3aeb3ee64b
Navin Kochar [Mon, 6 Jun 2016 20:30:06 +0000 (20:30 +0000)]
Fix for issue introduced due to rebase of LE L2CAP COC
am:
be3f7f9d24
* commit '
be3f7f9d244ca39a9a5a27afd3b117f83b69e0e4':
Fix for issue introduced due to rebase of LE L2CAP COC
Change-Id: Ibe88def5c20b8192e16db4c723c539c41921d9f7
Navin Kochar [Mon, 6 Jun 2016 20:29:48 +0000 (20:29 +0000)]
Fix for issue introduced due to rebase of LE L2CAP COC
am:
be3f7f9d24
* commit '
be3f7f9d244ca39a9a5a27afd3b117f83b69e0e4':
Fix for issue introduced due to rebase of LE L2CAP COC
Change-Id: Iac2d2fd11ec63a4bc6af70ffb5e72174ed940cbf
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
Nitin Arora [Mon, 6 Jun 2016 17:54:58 +0000 (17:54 +0000)]
Clear BLE block from device records at unpair am:
266ff1d759 am:
df95c615cb
am:
1f29d1a437
* commit '
1f29d1a43741326a347a5023cc96f1ca59d22c6f':
Clear BLE block from device records at unpair
Change-Id: Iacd667d6f04a022480e38ba3cd7b4a5d4c13fef5
Nitin Arora [Mon, 6 Jun 2016 17:52:07 +0000 (17:52 +0000)]
Clear BLE block from device records at unpair am:
266ff1d759
am:
df95c615cb
* commit '
df95c615cbbfae8303b100f163e006fab533a834':
Clear BLE block from device records at unpair
Change-Id: I4b7168e64d5e9935237725c43ae0440ad35ab9f3
Nitin Arora [Mon, 6 Jun 2016 17:44:36 +0000 (17:44 +0000)]
Clear BLE block from device records at unpair
am:
266ff1d759
* commit '
266ff1d759e7713b957cb73c8d0c7a0c0b70c7dd':
Clear BLE block from device records at unpair
Change-Id: I5cf9341cae1887226d7947a69b985d1d43f52254
Nitin Arora [Mon, 25 Apr 2016 21:47:51 +0000 (14:47 -0700)]
Clear BLE block from device records at unpair
Use Case:
Pair and unpair LE remote device repeatedly. The repair
intermittently fails with the error "DHKey Check Failure"
Failure:
Pairing failure is observed when pairing is performed
after unpairing, without performing a BT reset.
Further analysis of the SMP logs indicate that DUT uses the
static address of the remote device for calculation of the
MacKey value. At the time of pairing, the remote RPA should
be used (and the static address has not yet been distributed either).
The problem is caused by the previous dev record which is left in
the stack, and at the time of repair, stack picks the old device
record and reuses it.
Fix:
This change removes the entire BLE block from the device record,
after the unpairing is performed, so that a new device record
is allocated, after the repairing is done.
Bug:
27852645
Change-Id: I8d605d1bb3b1c32061a8d8a7a7fe0fe200030abc
Nitin Arora [Mon, 25 Apr 2016 21:47:51 +0000 (14:47 -0700)]
Clear BLE block from device records at unpair
Use Case:
Pair and unpair LE remote device repeatedly. The repair
intermittently fails with the error "DHKey Check Failure"
Failure:
Pairing failure is observed when pairing is performed
after unpairing, without performing a BT reset.
Further analysis of the SMP logs indicate that DUT uses the
static address of the remote device for calculation of the
MacKey value. At the time of pairing, the remote RPA should
be used (and the static address has not yet been distributed either).
The problem is caused by the previous dev record which is left in
the stack, and at the time of repair, stack picks the old device
record and reuses it.
Fix:
This change removes the entire BLE block from the device record,
after the unpairing is performed, so that a new device record
is allocated, after the repairing is done.
Bug:
27852645
Change-Id: I8d605d1bb3b1c32061a8d8a7a7fe0fe200030abc
JivakDhadse [Fri, 7 Aug 2015 13:28:38 +0000 (18:58 +0530)]
Revert "DO NOT MERGE Proper construction of AVDTP general reject message"
This reverts commit
2ed10d442266eade44be121cd24fd473c85007d0.
Original change needs to be reverted to align with Errata
ESR04 where "Section 8.17, General Reject Page 71" of adopted
AvDTP Spec is changed to have "Invalid Signal Identifier"
in first 6 bits of Octet 1.
This change helps passing PTS case TP/SIG/SMG/ESR04/BI-28-C
Bug:
27852645
Change-Id: Idfc960ce00662e8aacc26f3b3fdca9deca8a2aff
Navin Kochar [Fri, 18 Mar 2016 06:34:30 +0000 (12:04 +0530)]
Fix for issue introduced due to rebase of LE L2CAP COC
During
6721232 patch, some code got missed while doing manual rebase.
This patch is adding that missing code.
Bug:
27852645
Change-Id: I2525908c29e3288e0ace1ee26c5f2aa6cfd59d68
Signed-off-by: Navin Kochar <navin.kochar@intel.com>
Eri Kasamatsu [Fri, 3 Jun 2016 23:35:16 +0000 (23:35 +0000)]
Reset max_interval to BTM_BLE_CONN_INT_MIN_LIMIT am:
3bd286a411 am:
c2148b38cb
am:
87ac0eea2d
* commit '
87ac0eea2d1c8d3d40702a9fb25b97a7fb2a6fe9':
Reset max_interval to BTM_BLE_CONN_INT_MIN_LIMIT
Change-Id: I90b3e58612123930fcd32a3fc6555665ad8faef7
Eri Kasamatsu [Fri, 3 Jun 2016 22:04:34 +0000 (22:04 +0000)]
Reset max_interval to BTM_BLE_CONN_INT_MIN_LIMIT am:
3bd286a411
am:
c2148b38cb
* commit '
c2148b38cb53f577d5732bb093d70776fad59f66':
Reset max_interval to BTM_BLE_CONN_INT_MIN_LIMIT
Change-Id: Ic938e3424e66ddc6906b53d0ac9b08c375b447e4
Eri Kasamatsu [Fri, 3 Jun 2016 21:53:38 +0000 (21:53 +0000)]
Reset max_interval to BTM_BLE_CONN_INT_MIN_LIMIT
am:
3bd286a411
* commit '
3bd286a4112de2c68e7188c0001d884454686992':
Reset max_interval to BTM_BLE_CONN_INT_MIN_LIMIT
Change-Id: I688b68898a107ad28678a096739a6dde5e074c24
Eri Kasamatsu [Mon, 9 Nov 2015 05:40:02 +0000 (14:40 +0900)]
Reset max_interval to BTM_BLE_CONN_INT_MIN_LIMIT
In case of min_interval < BTM_BLE_CONN_INT_MIN_LIMIT
and max_interval < BTM_BLE_CONN_INT_MIN_LIMIT,
min_interval is reset to BTM_BLE_CONN_INT_MIN_LIMIT
but max_interval is not reset.
Then valid connection parameter updates can be rejected.
To avoid this, reset max_interval to BTM_BLE_CONN_INT_MIN_LIMIT
when max_interval is smaller than BTM_BLE_INT_MIN_LIMIT.
Change-Id: I5f54ddc0276f40d667ff433557b74ea4b100058d
Mudumba Ananth [Thu, 2 Jun 2016 10:40:52 +0000 (10:40 +0000)]
HFP 1.7 profile update (1/4)
am:
e5bed64926
* commit '
e5bed64926d6ae45501617052f90932287da135b':
HFP 1.7 profile update (1/4)
Change-Id: Id63d72433d5854f075364354eadb37568e97c949
Luis Hector Chavez [Wed, 1 Jun 2016 22:19:57 +0000 (22:19 +0000)]
Merge "bt: Update libchrome APIs to r395517" am:
cb3c6f3cd0 am:
7156015e90
am:
43ce224c5d
* commit '
43ce224c5d2418c72e19631f488e4a869cb8b0b7':
bt: Update libchrome APIs to r395517
Change-Id: I543f43aaee388fb137c4e9af12619e73e0c85078
Ajay Panicker [Wed, 1 Jun 2016 22:19:53 +0000 (22:19 +0000)]
net_test_bluetooth: RFCOMM test refactor am:
fa717c0b47 am:
7390de6ace
am:
d5a0b223bf
* commit '
d5a0b223bf5637165952d4bdfd67bf334dfef6b1':
net_test_bluetooth: RFCOMM test refactor
Change-Id: I4e1d0ce2d88738e9b96268b6b2b51232700696ff
Luis Hector Chavez [Wed, 1 Jun 2016 22:04:34 +0000 (22:04 +0000)]
Merge "bt: Update libchrome APIs to r395517" am:
cb3c6f3cd0
am:
7156015e90
* commit '
7156015e902c2c4b33079f354143f597cdd9c28b':
bt: Update libchrome APIs to r395517
Change-Id: I9fe6ea63138a35e9925ed339cf1f993ea059f475
Ajay Panicker [Wed, 1 Jun 2016 22:04:28 +0000 (22:04 +0000)]
net_test_bluetooth: RFCOMM test refactor am:
fa717c0b47
am:
7390de6ace
* commit '
7390de6ace68340ced99c84835e13aaf5c0af4a5':
net_test_bluetooth: RFCOMM test refactor
Change-Id: I436f760e8e2d57283da0abff75d137837c5fe13d
Luis Hector Chavez [Wed, 1 Jun 2016 21:57:38 +0000 (21:57 +0000)]
Merge "bt: Update libchrome APIs to r395517"
am:
cb3c6f3cd0
* commit '
cb3c6f3cd0b908e36443d41c2d736b88d742ee1a':
bt: Update libchrome APIs to r395517
Change-Id: I579baf27f8e777b16c559ba30bf649fc3958b94e
Ajay Panicker [Wed, 1 Jun 2016 21:57:35 +0000 (21:57 +0000)]
net_test_bluetooth: RFCOMM test refactor
am:
fa717c0b47
* commit '
fa717c0b47bb1fed04da295eaa580a92bc08c622':
net_test_bluetooth: RFCOMM test refactor
Change-Id: I4f5d85e43462e666ead4714b92b77cf95db3bdff
Luis Hector Chavez [Wed, 1 Jun 2016 21:50:00 +0000 (21:50 +0000)]
Merge "bt: Update libchrome APIs to r395517"
Mudumba Ananth [Mon, 29 Feb 2016 10:21:43 +0000 (02:21 -0800)]
HFP 1.7 profile update (1/4)
-> Added AG support for HFP 1.7 version upgrade which
adds new type of indicator called HF(headset) indicators.
-> Added support for two new AT commands AT + BIND and AT + BIEV
which have been appended to Hands-Free SLC sequence.
-> Added support to propagate the above commands and their data to
the upper layers.
Bug:
19983867
Change-Id: I93d5b2af949f9fb99507a954e623cd0927ddc976
Ajay Panicker [Mon, 7 Dec 2015 22:18:16 +0000 (14:18 -0800)]
net_test_bluetooth: RFCOMM test refactor
Properly implement RFCOMM tests into net_test_rfcomm using GUnit.
Contains all the RFCOMM tests and the base class that the tests use.
This test currently requires the DUT to be paired with an HFP capable
device.
Bug:
25793348
Change-Id: I683db7c5f2779373b2e343c7ad21268e4969d014
Andre Eisenbach [Wed, 1 Jun 2016 06:16:34 +0000 (06:16 +0000)]
HID: Check for EINTR in uhid_event() and fix return value evaluation am:
32d66694e9
am:
5330968a4f
* commit '
5330968a4f44d877fd0400e7ce7e1c7ed8d72954':
Change-Id: I91328041fb31107da4cc7a78c7d031f0c8250bf8
Andre Eisenbach [Wed, 1 Jun 2016 06:11:47 +0000 (06:11 +0000)]
resolve merge conflicts of
32d6669 to nyc-dev-plus-aosp
am:
4cd0416bdf
* commit '
4cd0416bdfcf6d55a8f1d615d8177f486d326dee':
HID: Check for EINTR in uhid_event() and fix return value evaluation
Change-Id: Ib47c19a0d0234d03405b43484127673106e55e83
Andre Eisenbach [Wed, 1 Jun 2016 06:02:39 +0000 (23:02 -0700)]
resolve merge conflicts of
32d6669 to nyc-dev-plus-aosp
Change-Id: I949ead7d023a70561ab498c9772e8abbe17a01a6
Andre Eisenbach [Wed, 1 Jun 2016 03:01:17 +0000 (03:01 +0000)]
HID: Check for EINTR in uhid_event() and fix return value evaluation
am:
32d66694e9
* commit '
32d66694e9f782a0e9dfa423015284a573f8975c':
HID: Check for EINTR in uhid_event() and fix return value evaluation
Change-Id: I0b762d88a94c33a78384e4dbd85fe1325b5e6e7d
Andre Eisenbach [Wed, 1 Jun 2016 01:44:01 +0000 (01:44 +0000)]
Bump HDP version to 1.1
am:
c07cee0194
* commit '
c07cee0194891e0708aec70bf8eabea87eae0847':
Bump HDP version to 1.1
Change-Id: I2a317b85d8d18d36bccd725fff77b633de99e369
Jakub Pawlowski [Wed, 1 Jun 2016 01:32:48 +0000 (01:32 +0000)]
Remove currently unused peer device module and tests am:
bc472821fe am:
21594289ea
am:
bd610187bf
* commit '
bd610187bf0c277c226305c94df17657087d74df':
Remove currently unused peer device module and tests
Change-Id: I4009c6a596cbc047b865dceb981c58f4dfbb5306
Jakub Pawlowski [Wed, 1 Jun 2016 01:25:06 +0000 (01:25 +0000)]
Remove currently unused peer device module and tests am:
bc472821fe
am:
21594289ea
* commit '
21594289ea9a88046e74caedfaac646aa26667d9':
Remove currently unused peer device module and tests
Change-Id: I016b23ad8017f9d51459fb1d5f5935b9f3f23d93
Jakub Pawlowski [Wed, 1 Jun 2016 01:20:13 +0000 (01:20 +0000)]
Remove currently unused peer device module and tests
am:
bc472821fe
* commit '
bc472821fe8aac8fca089082496f5b7d067ffae8':
Remove currently unused peer device module and tests
Change-Id: I6f9893bbb49f077b250b17c6ab73ead56ab8b60f
Jakub Pawlowski [Sat, 28 May 2016 00:06:39 +0000 (17:06 -0700)]
Remove currently unused peer device module and tests
The module is currently not used and it is currently not obvious if this
should be a module in the first place.
Filed separate bug (#
29057391) to re-visit the concept in a future
refactor, but removing unused code for now.
Bug:
29000421
Change-Id: Ie369574e62281fa1d7c3284c86c4509de558fa15
Andre Eisenbach [Tue, 31 May 2016 21:18:36 +0000 (14:18 -0700)]
Bump HDP version to 1.1
Change-Id: I0bdec6fffa097dc919ee495216a2f272cc0dcf1e
(cherry picked from commit
bb838444c37642b7272e3ae4acaaa7a06a568cdb)
Andre Eisenbach [Wed, 1 Jun 2016 00:16:23 +0000 (00:16 +0000)]
Bump HDP version to 1.1 am:
bb838444c3 am:
49f9eb0bb6
am:
f48d7046da
* commit '
f48d7046daba35375214b1d50858addd43cdb0c1':
Bump HDP version to 1.1
Change-Id: I58369f1486d808d3e2b51205134e751da27b31ae
Andre Eisenbach [Wed, 1 Jun 2016 00:12:46 +0000 (00:12 +0000)]
Bump HDP version to 1.1 am:
bb838444c3
am:
49f9eb0bb6
* commit '
49f9eb0bb66dc8d9ba9226c47c88610cc24aec55':
Bump HDP version to 1.1
Change-Id: If2e944edaf11dafd69ba10da802afe519a36b8d7
Andre Eisenbach [Wed, 1 Jun 2016 00:09:40 +0000 (00:09 +0000)]
Bump HDP version to 1.1
am:
bb838444c3
* commit '
bb838444c37642b7272e3ae4acaaa7a06a568cdb':
Bump HDP version to 1.1
Change-Id: I7e39e0c6caace2077133c8cf6dd1ae9aa6b82673
Andre Eisenbach [Tue, 31 May 2016 21:18:36 +0000 (14:18 -0700)]
Bump HDP version to 1.1
Change-Id: I0bdec6fffa097dc919ee495216a2f272cc0dcf1e
Ayan Ghosh [Mon, 30 May 2016 23:34:18 +0000 (23:34 +0000)]
resolve merge conflicts of
934747d to nyc-dev-plus-aosp
am:
6efca2e76b
* commit '
6efca2e76bb58f2949d93cbd7f5a9cb0dc276f9a':
Limit number of SBC frames to fit into single MTU
Change-Id: I01721148de302de9d4bb0bfcb12b0fc6a4b10cd3
Andre Eisenbach [Mon, 30 May 2016 23:23:11 +0000 (16:23 -0700)]
resolve merge conflicts of
934747d to nyc-dev-plus-aosp
Change-Id: Ifea8e5daf03ae684ad22e0dc790ae1bd26ba0035
Ayan Ghosh [Mon, 30 May 2016 23:09:24 +0000 (23:09 +0000)]
Limit number of SBC frames to fit into single MTU
am:
e9a52af36d
* commit '
e9a52af36d087ea68ec7ba5ed3f25c24fb3cdf64':
Limit number of SBC frames to fit into single MTU
Change-Id: Ia96d418dfa7968981e1585f7d4f078035c5a317b
Ayan Ghosh [Mon, 11 Nov 2013 13:55:16 +0000 (19:25 +0530)]
Limit number of SBC frames to fit into single MTU
- Calculate number of SBC frames to fit into single MTU for EDR capable
remote devices. This makes sure the maximum utilization of the
available bandwidth, keeping the bitrate at high quality.
- This change helps to address the discrepancy seen with a few available
2 Mbps headsets which set the AVDTP media MTU size greater than the
2DH5 packet payload size which eventually forces AVDTP packets to get
fragmented in the controller. This change ensures packing of the SBC
frames in a way that AVDTP packet size fits within the 2DH5 payload
size.
- As packet size is restricted to meet the required bit rate more than
one AVDTP packet can be sent to the controller in a given iteration
based on the bit rate requirement.
Bug:
24875861
Change-Id: Icae7656ad563bbbdef65ecbfa15a89b26cf9edb2
Andre Eisenbach [Mon, 30 May 2016 19:00:46 +0000 (12:00 -0700)]
HID: Check for EINTR in uhid_event() and fix return value evaluation
uhid_event() returns 0 in the normal case. Commit
3a2c2d61
results in the polling thread to be exited.
Bug:
28942565
Change-Id: Id0aff2958bc7c2704ba340aa0ff7848afb8dcf80
Pavlin Radoslavov [Fri, 27 May 2016 20:49:59 +0000 (20:49 +0000)]
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE am:
6834570262
am:
e88554b10f
* commit '
e88554b10fd6fc7934eee792bad46d15253bf6a2':
Change-Id: I69a810fbc7ff7b3b98d998a32a669fcbb3780b4e
Pavlin Radoslavov [Fri, 27 May 2016 20:46:47 +0000 (20:46 +0000)]
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE am:
6834570262
am:
072f7adec1
* commit '
072f7adec1cf0809accc4490a138ce15bd496483':
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
Change-Id: I459b035f5c235101b0e78b4cbe29cb51ce471ccd
Pavlin Radoslavov [Fri, 27 May 2016 20:44:09 +0000 (20:44 +0000)]
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
am:
6834570262
* commit '
6834570262116974a176cd8598b6d0ca6d031aca':
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
Change-Id: Ie47f42f72515b974a51749acda0496c8467ff636
Pavlin Radoslavov [Fri, 27 May 2016 20:44:09 +0000 (20:44 +0000)]
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
am:
6834570262
* commit '
6834570262116974a176cd8598b6d0ca6d031aca':
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
Change-Id: I406540a4a8fdf864717cd3ebf89ca814ba1ba991
Pavlin Radoslavov [Fri, 27 May 2016 20:22:05 +0000 (20:22 +0000)]
Merge "Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE" am:
692c63af2e am:
b6426a8d3c
am:
55fbfbe5eb
* commit '
55fbfbe5ebb4d2e60ab375a5371317920c0f18f1':
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
Change-Id: I191110ea999cd4b546f82a8bc835c389896c63f1
Pavlin Radoslavov [Fri, 27 May 2016 20:19:18 +0000 (20:19 +0000)]
Merge "Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE" am:
692c63af2e
am:
b6426a8d3c
* commit '
b6426a8d3ca4ccc036f5130b36f90a8db84d4b78':
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
Change-Id: I220d5c502dad4f08c8a7631e74ac7c4ad4d78f0d
Pavlin Radoslavov [Fri, 27 May 2016 20:12:40 +0000 (20:12 +0000)]
Merge "Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE"
am:
692c63af2e
* commit '
692c63af2e1a8adc5bb98084b16e26ba8445ecfe':
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
Change-Id: Id962d5c6fac28fd352ca0f4b191a86c42460cba2
Treehugger Robot [Fri, 27 May 2016 20:01:16 +0000 (20:01 +0000)]
Merge "Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE"
Chih-Hung Hsieh [Fri, 27 May 2016 19:36:11 +0000 (19:36 +0000)]
Fix misc-macro-parentheses warnings in embdrv/sbc. am:
7b7b057828 am:
89ebdc41bf
am:
cff8887f70
* commit '
cff8887f709c7c74aa35fb4e762e8e21c64eb5c4':
Fix misc-macro-parentheses warnings in embdrv/sbc.
Change-Id: Ifbe8f1286825e71466a755f2674e05afa365ed58
Chih-Hung Hsieh [Fri, 27 May 2016 19:31:37 +0000 (19:31 +0000)]
Fix misc-macro-parentheses warnings in embdrv/sbc. am:
7b7b057828
am:
89ebdc41bf
* commit '
89ebdc41bf3ab8f285ed34dde63a6f628bd94aa6':
Fix misc-macro-parentheses warnings in embdrv/sbc.
Change-Id: I723d7868ddeb7513dec76ffa503419f9ebdf699a
Chih-Hung Hsieh [Fri, 27 May 2016 19:26:25 +0000 (19:26 +0000)]
Fix misc-macro-parentheses warnings in embdrv/sbc.
am:
7b7b057828
* commit '
7b7b0578285281c762bd52255072cb34800ec7ea':
Fix misc-macro-parentheses warnings in embdrv/sbc.
Change-Id: Ifd3ad6cfb1b0f12230d8367f9cf2a8b84c1b7fd9
Pavlin Radoslavov [Fri, 27 May 2016 19:07:06 +0000 (12:07 -0700)]
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
Bug:
28614494
Change-Id: I3f4a923f9e14faef57b2d694bfc253fd10749414
(cherry picked from commit
7496372239773b7121359a34291681b749beda5f)
Pavlin Radoslavov [Fri, 27 May 2016 19:07:06 +0000 (12:07 -0700)]
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
Bug:
28614494
Change-Id: I3f4a923f9e14faef57b2d694bfc253fd10749414