OSDN Git Service
Hansong Zhang [Fri, 2 Oct 2020 23:36:19 +0000 (23:36 +0000)]
Link flush timeout is unused am:
12a0975cd7 am:
3a9ff02ce7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443307
Change-Id: I9fdaf1a2fa3e6837e172108e2ef2056401ba929b
Hansong Zhang [Fri, 2 Oct 2020 23:15:40 +0000 (23:15 +0000)]
Link flush timeout is unused am:
12a0975cd7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443307
Change-Id: Ie633a77db877c5e3e99528680b790fd886f90cd6
Myles Watson [Fri, 2 Oct 2020 22:53:40 +0000 (22:53 +0000)]
HIDH: Don't set a minimum MTU am:
85ef9c4772 am:
c58fba31a3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446995
Change-Id: I3259a49b9e02cc8162bc0cf9cb7418e67fec52e1
Hansong Zhang [Thu, 1 Oct 2020 06:53:46 +0000 (23:53 -0700)]
Link flush timeout is unused
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Icf6fec9bd038210a31eb8ab38a96f44d3ce2ffd2
Myles Watson [Fri, 2 Oct 2020 22:37:04 +0000 (22:37 +0000)]
HIDH: Don't set a minimum MTU am:
85ef9c4772
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446995
Change-Id: I75f73aead0b8661c7897b222c77077e84d572477
Chris Manton [Fri, 2 Oct 2020 16:51:59 +0000 (16:51 +0000)]
Add ACL shim event registration - with deps am:
2f01df7224 am:
c2a6ac2aad
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446135
Change-Id: Ibd7dd24dd86e606a793b413ef307d8a9e5ff822c
Chris Manton [Fri, 2 Oct 2020 16:51:57 +0000 (16:51 +0000)]
Single out Register events LE_META_EVENT as special am:
f58215f418 am:
44f0621643
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439640
Change-Id: Ib78883c601a0d2b78c60485c95cd3375689ddf62
Myles Watson [Fri, 2 Oct 2020 16:49:50 +0000 (09:49 -0700)]
HIDH: Don't set a minimum MTU
Bug:
169780397
Test: Pair with a logitech 557 mouse
Tag: #gd-refactor
Change-Id: I5ad88645ea45e3ae016f5a6f54017558ae2b8049
Chris Manton [Fri, 2 Oct 2020 16:32:29 +0000 (16:32 +0000)]
Add ACL shim event registration - with deps am:
2f01df7224
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446135
Change-Id: Id5691b65ae6198a10f33791dce20775d8b72f43d
Chris Manton [Fri, 2 Oct 2020 16:31:46 +0000 (16:31 +0000)]
Single out Register events LE_META_EVENT as special am:
f58215f418
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439640
Change-Id: Ib9d443e9048851b34ef33b5f5ecce62180301f3c
Chris Manton [Mon, 28 Sep 2020 20:15:06 +0000 (13:15 -0700)]
Add ACL shim event registration - with deps
Bug:
166280067
Tag: #refactor
Test: gd/cert/run --host
Test: ble paired 2 phones
Test: act.py -tc BleCocTest
Change-Id: I6494212c0f61d478792fc2948c12ae4187576cd1
Chris Manton [Sat, 26 Sep 2020 23:07:41 +0000 (16:07 -0700)]
Single out Register events LE_META_EVENT as special
LE_META_EVENT is a special event that multiplexes LE
events underneath and should not be exposed.
Test Parameters: INIT_gd_hci=true
Bug:
166280067
Tag: #refactor
Test: gd/cert/run --host
Test: ble paired 2 phones
Test: act.py -tc BleCocTest
Change-Id: Idf8dd9fa9e13fc9e2d1d7d89d6af0a16ec574b89
Jakub Pawlowski [Fri, 2 Oct 2020 07:51:59 +0000 (07:51 +0000)]
Merge "Store LE device keys when bonded" am:
63a115e407 am:
ed1935c9e6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1442942
Change-Id: I780dcf310001ef1118ea0198471ff006dbc9384f
Jakub Pawlowski [Fri, 2 Oct 2020 07:13:58 +0000 (07:13 +0000)]
Merge "Store LE device keys when bonded" am:
63a115e407
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1442942
Change-Id: I3017c883fce238567ddb4bcac940962e6633e720
Jakub Pawlowski [Fri, 2 Oct 2020 06:41:13 +0000 (06:41 +0000)]
Merge "Store LE device keys when bonded"
Treehugger Robot [Fri, 2 Oct 2020 02:50:11 +0000 (02:50 +0000)]
Merge "HIDH: Register for HID_PSM_CONTROL" am:
0978770013 am:
b6328e08f8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1445756
Change-Id: Ia084b3eb5096bb6280c6dde2d75cb7fa21273a3c
Treehugger Robot [Fri, 2 Oct 2020 02:27:12 +0000 (02:27 +0000)]
Merge "HIDH: Register for HID_PSM_CONTROL" am:
0978770013
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1445756
Change-Id: Ia0290a8bed8f07f510717f1fcb66548cf545d65e
Treehugger Robot [Fri, 2 Oct 2020 02:00:35 +0000 (02:00 +0000)]
Merge "HIDH: Register for HID_PSM_CONTROL"
Treehugger Robot [Fri, 2 Oct 2020 00:26:06 +0000 (00:26 +0000)]
Merge "Revert "Add ACL shim event registration"" am:
467dd9cb60 am:
4f7150e3f3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443582
Change-Id: Iffd24ef4358a273a420c869cf5ab2f44606e22a9
Treehugger Robot [Thu, 1 Oct 2020 23:53:50 +0000 (23:53 +0000)]
Merge "Revert "Add ACL shim event registration"" am:
467dd9cb60
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443582
Change-Id: I77b17f765429cef715a9888dca7b377664d531fd
Treehugger Robot [Thu, 1 Oct 2020 23:19:19 +0000 (23:19 +0000)]
Merge "Revert "Add ACL shim event registration""
Myles Watson [Thu, 1 Oct 2020 22:49:41 +0000 (15:49 -0700)]
HIDH: Register for HID_PSM_CONTROL
Bug:
169780397
Test: Pair with a classic HID device
Tag: #gd-refactor
Change-Id: I22fa725c2665282b2c246256c838fdbc8bc05549
Hansong Zhang [Thu, 1 Oct 2020 21:06:17 +0000 (21:06 +0000)]
L2cap user dynamic channel: move psm alloc to bta am:
ca3b34e4de am:
696986fbf5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443306
Change-Id: Id4f15705c9707af39f6771c83ac6d069b8e9bb50
Hansong Zhang [Thu, 1 Oct 2020 21:06:13 +0000 (21:06 +0000)]
Clean up unused avdt definitions am:
f7cb243d3c am:
a98512400b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443305
Change-Id: I9422ac875bc2dcdb68a6453bff9e23eedd461833
Hansong Zhang [Thu, 1 Oct 2020 20:43:05 +0000 (20:43 +0000)]
L2cap user dynamic channel: move psm alloc to bta am:
ca3b34e4de
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443306
Change-Id: I5acd29f16654866ec6876ba4e030d8795e94e964
Hansong Zhang [Thu, 1 Oct 2020 20:42:21 +0000 (20:42 +0000)]
Clean up unused avdt definitions am:
f7cb243d3c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443305
Change-Id: I89a587492da156483f685a66b49480dabe00e38f
Chris Manton [Thu, 1 Oct 2020 17:48:30 +0000 (10:48 -0700)]
Revert "Add ACL shim event registration"
Test: Compiles
Bug:
166280067
Tag: #refactor
This reverts commit
a6b323be6e84c6fb0e986b73a8555314044618ab.
Change-Id: I99b4f8b8fa7118cd2754477209b8e81916cb4811
Hansong Zhang [Thu, 1 Oct 2020 06:41:01 +0000 (23:41 -0700)]
L2cap user dynamic channel: move psm alloc to bta
Only used by bta_jv. No need to have a L2cap-level psm allocation.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: If445b392d1ca67a5a94c5cc180566d31c1dcf698
Hansong Zhang [Thu, 1 Oct 2020 06:20:11 +0000 (23:20 -0700)]
Clean up unused avdt definitions
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iac74f0262f77d4a9dd040f767f0b54151c089376
Treehugger Robot [Thu, 1 Oct 2020 18:35:29 +0000 (18:35 +0000)]
Merge changes from topic "gd_security_shim" am:
c0b890c4f9 am:
25586afa90
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443318
Change-Id: If9f0e83102bd29a591997b354eaa1d6fd3ff585a
Hansong Zhang [Thu, 1 Oct 2020 18:35:16 +0000 (18:35 +0000)]
BTA_AV: Unused variables am:
88c29c75de am:
ca85d65a95
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443547
Change-Id: I00dcdde8abd7e2f3887408ee781b62a78e1bb11e
Hansong Zhang [Thu, 1 Oct 2020 18:35:15 +0000 (18:35 +0000)]
L2CA_SetFlushTimeout does nothing. am:
407d7fb54f am:
54b8ca40db
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443546
Change-Id: Ibff3d17b4f4fc46a60787c198354f613626a99ad
Hansong Zhang [Thu, 1 Oct 2020 18:35:12 +0000 (18:35 +0000)]
L2cap: clean up flush timeout option am:
d38a1018c7 am:
9723d8ca98
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443545
Change-Id: I6fa3ee620c3e1986802e0b0a9fd9405f2aeb0053
Hansong Zhang [Thu, 1 Oct 2020 18:35:08 +0000 (18:35 +0000)]
BTA_AV: Unused variable am:
a78a7f5bba am:
4d544d2180
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443544
Change-Id: Icf274dad2c288a548b6e6b181848244ee279b437
Hansong Zhang [Thu, 1 Oct 2020 18:35:03 +0000 (18:35 +0000)]
BTA_AV: Simplify flush timeout parameter am:
83db55569e am:
64503b3db7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443543
Change-Id: I697231ea032873647a48c90c8745f9d8e4963b31
Treehugger Robot [Thu, 1 Oct 2020 18:26:21 +0000 (18:26 +0000)]
Merge changes from topic "gd_security_shim" am:
c0b890c4f9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443318
Change-Id: I4560689aa7a0b593c1ef99b54e6fb322fe8ca199
Treehugger Robot [Thu, 1 Oct 2020 18:24:37 +0000 (18:24 +0000)]
Merge changes from topic "gd_security_shim"
* changes:
BTM Shim: Put/Get information bits to ConfirmationData
Introduce ConfirmationData
Hansong Zhang [Thu, 1 Oct 2020 18:17:50 +0000 (18:17 +0000)]
BTA_AV: Unused variables am:
88c29c75de
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443547
Change-Id: I2fab2416f6e57515f4f2736c32c6f482e9653b16
Hansong Zhang [Thu, 1 Oct 2020 18:17:46 +0000 (18:17 +0000)]
L2CA_SetFlushTimeout does nothing. am:
407d7fb54f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443546
Change-Id: I2c61e4fe9876083f8c7b777885a4838be3299e5f
Hansong Zhang [Thu, 1 Oct 2020 18:17:42 +0000 (18:17 +0000)]
L2cap: clean up flush timeout option am:
d38a1018c7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443545
Change-Id: I0128d6adaf179e083fc001489c134f717f868ec9
Hansong Zhang [Thu, 1 Oct 2020 18:17:39 +0000 (18:17 +0000)]
BTA_AV: Unused variable am:
a78a7f5bba
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443544
Change-Id: I57ce28351d459d66b8266c14abbdca6ab72489b8
Hansong Zhang [Thu, 1 Oct 2020 18:16:57 +0000 (18:16 +0000)]
BTA_AV: Simplify flush timeout parameter am:
83db55569e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443543
Change-Id: If5af90be05749f2dead9c05594bcb9f5de294fbb
Martin Brabham [Mon, 21 Sep 2020 17:12:30 +0000 (10:12 -0700)]
BTM Shim: Put/Get information bits to ConfirmationData
We need the io_caps, auth_reqs, and oob present to send to BTA.
We won't need this when the shim goes away, but for now its necessary.
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Change-Id: I3f3a2ba909ed4384ca44ad2ddca5b5ecda64822e
Martin Brabham [Thu, 17 Sep 2020 19:50:18 +0000 (12:50 -0700)]
Introduce ConfirmationData
ConfirmationData is an object to contain information
for passing to the UI via Display* functions defined
in the class Ui.
This consolidates the required function signature from 2-3 arguments
down to a single argument. Additionally, we gain a feature
for putting and getting extra data. This extra data mechanism
will allow for the SecurityModule to pass information to the shim
such as:
- IO Capability
- Authentication Requirements
- MITM bit
It is required that we map these in the shim and pass them back to
BTA in order to drive the BTA state machine properly.
BYPASS_INCLUSIVE_LANGUAGE_REASON="following bluetooth specification terms"
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I30b19fb5a3d5fa3462cf4fdc5f47df5d5bb4c478
Hansong Zhang [Thu, 1 Oct 2020 07:51:57 +0000 (07:51 +0000)]
L2cap: our cfg option never uses flush timeout am:
6606d192a4 am:
9e97957e6b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443542
Change-Id: Ie0491a3e9115cf614bc0448804df9290eb983182
Treehugger Robot [Thu, 1 Oct 2020 07:51:14 +0000 (07:51 +0000)]
Merge "Use bta/sys/bta_sys::BtaIdSysText()" am:
56f4b403b2 am:
22ec3bb2c6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1441962
Change-Id: I8fad24d24caea0390ba0b51a38f87fe90729d1b1
Chris Manton [Thu, 1 Oct 2020 07:50:10 +0000 (07:50 +0000)]
Incoming ACL packets stop at acl layer first am:
d9f3e3f18a am:
1e410a9b15
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443539
Change-Id: I35025154f988b62a039e8a4e9ff1384a2fa45e8a
Chris Manton [Thu, 1 Oct 2020 07:50:05 +0000 (07:50 +0000)]
Re-log bta/../LOG_ am:
eed7c58c64 am:
bdf5a1f6cb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437480
Change-Id: Id17bb9691ff24aeac2f6b65240f6dcfcf98554af
Hansong Zhang [Thu, 1 Oct 2020 07:32:54 +0000 (07:32 +0000)]
L2cap: our cfg option never uses flush timeout am:
6606d192a4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443542
Change-Id: Id67aa42f76b52bc2019a93972482ad217de4df45
Treehugger Robot [Thu, 1 Oct 2020 07:32:45 +0000 (07:32 +0000)]
Merge "Use bta/sys/bta_sys::BtaIdSysText()" am:
56f4b403b2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1441962
Change-Id: Id1718b0e7055453025e8bd4810279644d8c16693
Chris Manton [Thu, 1 Oct 2020 07:32:21 +0000 (07:32 +0000)]
Incoming ACL packets stop at acl layer first am:
d9f3e3f18a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443539
Change-Id: I1f881a2b3ea09344168485231bfd23c0541d8d3c
Chris Manton [Thu, 1 Oct 2020 07:31:33 +0000 (07:31 +0000)]
Re-log bta/../LOG_ am:
eed7c58c64
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437480
Change-Id: Iaaa87f772fa6ae6b03ec317636ab582dcbda3f69
Hansong Zhang [Wed, 30 Sep 2020 23:54:55 +0000 (16:54 -0700)]
BTA_AV: Unused variables
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I9aa90fdb30e91cb61d4db4596d5f68743540d225
Hansong Zhang [Wed, 30 Sep 2020 23:33:21 +0000 (16:33 -0700)]
L2CA_SetFlushTimeout does nothing.
Since LinkFlushTimeout is always 0 and we always set it to 0.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ia6a87f45f59b4bb429aba98f921785b3e9e0d309
Hansong Zhang [Wed, 30 Sep 2020 23:30:40 +0000 (16:30 -0700)]
L2cap: clean up flush timeout option
Seems that only one value is used.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6da78ec6108cb34316199fb16b52bacee6bf74a1
Hansong Zhang [Wed, 30 Sep 2020 23:29:20 +0000 (16:29 -0700)]
BTA_AV: Unused variable
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I0fbf4c28f24bd61aa500dc00f9da51dd5bc2234e
Hansong Zhang [Wed, 30 Sep 2020 23:24:09 +0000 (16:24 -0700)]
BTA_AV: Simplify flush timeout parameter
Always 0.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ibd66605d65a421386b2b48766808b5be3f3c8e4e
Hansong Zhang [Wed, 30 Sep 2020 23:16:29 +0000 (16:16 -0700)]
L2cap: our cfg option never uses flush timeout
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1fe3a1192bf70d590926e7702aadb57722835a85
Treehugger Robot [Thu, 1 Oct 2020 03:06:17 +0000 (03:06 +0000)]
Merge "Use bta/sys/bta_sys::BtaIdSysText()"
Chris Manton [Wed, 30 Sep 2020 22:46:41 +0000 (15:46 -0700)]
Incoming ACL packets stop at acl layer first
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: Icbc0193a0db19c05f1edd5d4c3ea168819bae17b
Chris Manton [Fri, 4 Sep 2020 01:37:35 +0000 (18:37 -0700)]
Re-log bta/../LOG_
Towards readable logs
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: If2da96e529d07baa0e3f74d384833ce19d25b33a
Treehugger Robot [Wed, 30 Sep 2020 23:37:59 +0000 (23:37 +0000)]
Merge "Add ACL shim event registration" am:
71202c6785 am:
37f641ad3e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1441451
Change-Id: I0996ea870d101c510530fcbb3c53f7654b5c4eea
Chris Manton [Thu, 24 Sep 2020 06:11:42 +0000 (23:11 -0700)]
Use bta/sys/bta_sys::BtaIdSysText()
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I149985efc21bdad7b5039085226194c80877485f
Treehugger Robot [Wed, 30 Sep 2020 23:24:29 +0000 (23:24 +0000)]
Merge "Add ACL shim event registration" am:
71202c6785
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1441451
Change-Id: If275b270455f625c4da1345f2d8f53decfe8a97e
Treehugger Robot [Wed, 30 Sep 2020 22:56:23 +0000 (22:56 +0000)]
Merge changes I2f2c69a4,I41a65c6c,I101aa769,I87d34f49,Ifb5e07f6, ... am:
c898e62148 am:
9c4d10bd32
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443015
Change-Id: I2b88f89e8fcfa3c16d92c006cb25889723830231
Treehugger Robot [Wed, 30 Sep 2020 22:53:40 +0000 (22:53 +0000)]
Merge "Add ACL shim event registration"
Treehugger Robot [Wed, 30 Sep 2020 22:32:17 +0000 (22:32 +0000)]
Merge changes I2f2c69a4,I41a65c6c,I101aa769,I87d34f49,Ifb5e07f6, ... am:
c898e62148
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443015
Change-Id: I07f570638846a4aa4ae9c5bb0da14b76de1f158b
Treehugger Robot [Wed, 30 Sep 2020 22:15:48 +0000 (22:15 +0000)]
Merge changes I2f2c69a4,I41a65c6c,I101aa769,I87d34f49,Ifb5e07f6, ...
* changes:
Remove unnecessary declarations stack/btm/btm_sco
Locally link and remove unused funcs stack/btm/btm_sco
Re-log stack/btm/btm_ble_gap::btm_ble_update_inq_result
Remove duplicate decls stack/btm/btm_int
Locally link and remove unused funcs stack/btm/btm_inq
Remove decl stack/btm/btm_int
Locally link and remove unused funcs stack/btm/btm_devctl
Locally link and remove unused funcs stack/btm/btm_ble_cont_energy
Locally link and remove unused funcs stack/btm/btm_ble_adv_filter
Locally link and remove unused funcs stack/btm/btm_ble_addr
Remove unnecessary declarations stack/btm/btm_ble_int
Remove duplicate decls
Add bta/sys/bta_sys::BtaIdSysText()
Re-log parts of btif/src/btif_storage
Re-log parts of btif/src/btif_sock_thread
Re-log btif/src/btif_sock_rfc::btsock_rfc_listen
Sal Savage [Wed, 30 Sep 2020 20:35:33 +0000 (20:35 +0000)]
Merge "Properly update config when the MAC Address changes" am:
eaa91905c1 am:
e87e77d590
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1441627
Change-Id: Ifec42232d58f0b8f93625a8064febbb488741297
Martin Brabham [Wed, 30 Sep 2020 20:35:28 +0000 (20:35 +0000)]
CertSecurity: Add missing events to registration am:
18de3f6cbe am:
5fd4e0be46
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443278
Change-Id: Ic649528264f2235c33d3d4de417631a92fba9b59
Chris Manton [Mon, 28 Sep 2020 20:15:06 +0000 (13:15 -0700)]
Add ACL shim event registration
Bug:
166280067
Tag: #refactor
Test: gd/cert/run --host
Test: ble paired 2 phones
Test: act.py -tc BleCocTest
Change-Id: Ie5c1fcf271c8af2d7e8ef32f43e87672c47d536b
Sal Savage [Wed, 30 Sep 2020 20:17:33 +0000 (20:17 +0000)]
Merge "Properly update config when the MAC Address changes" am:
eaa91905c1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1441627
Change-Id: Id8033beb2c39ee10f8884b2027896cf58a16b8ab
Martin Brabham [Wed, 30 Sep 2020 20:16:33 +0000 (20:16 +0000)]
CertSecurity: Add missing events to registration am:
18de3f6cbe
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443278
Change-Id: Iaafa9aabe77c5e97c6a7c057989d9d0f824dcab2
Sal Savage [Wed, 30 Sep 2020 20:06:18 +0000 (20:06 +0000)]
Merge "Properly update config when the MAC Address changes"
Chris Manton [Sun, 20 Sep 2020 02:41:02 +0000 (19:41 -0700)]
Remove unnecessary declarations stack/btm/btm_sco
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I2f2c69a445738420f0a316a1e4c36a879f6ce516
Chris Manton [Wed, 30 Sep 2020 16:43:20 +0000 (09:43 -0700)]
Locally link and remove unused funcs stack/btm/btm_sco
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I41a65c6c12648868c804b1783558bb4aa1b96aed
Chris Manton [Sat, 26 Sep 2020 23:24:26 +0000 (16:24 -0700)]
Re-log stack/btm/btm_ble_gap::btm_ble_update_inq_result
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I101aa7696dbb42661753cf6cd08f3c1dca5c4c6f
Chris Manton [Sun, 20 Sep 2020 02:42:01 +0000 (19:42 -0700)]
Remove duplicate decls stack/btm/btm_int
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I87d34f49bc6a325d6dcc6ada7ac125fedd9cd9b3
Chris Manton [Sun, 20 Sep 2020 02:40:37 +0000 (19:40 -0700)]
Locally link and remove unused funcs stack/btm/btm_inq
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: Ifb5e07f6ed4c34af4fb06765d9db53ef802ad24b
Chris Manton [Sun, 20 Sep 2020 02:28:26 +0000 (19:28 -0700)]
Remove decl stack/btm/btm_int
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: Ie3915f1024cd82063534b9898fc60fa3eb776f10
Chris Manton [Sun, 20 Sep 2020 02:27:54 +0000 (19:27 -0700)]
Locally link and remove unused funcs stack/btm/btm_devctl
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I1eda2d00df6b05437fdd1d5a9cb331f53d3a94fd
Chris Manton [Sun, 20 Sep 2020 02:27:12 +0000 (19:27 -0700)]
Locally link and remove unused funcs stack/btm/btm_ble_cont_energy
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I7df768d8a8e953fed7478e527b97412511d2252f
Chris Manton [Sun, 20 Sep 2020 01:46:52 +0000 (18:46 -0700)]
Locally link and remove unused funcs stack/btm/btm_ble_adv_filter
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I3d9da417cd70567e0f985c34500098827c4e842d
Chris Manton [Sun, 20 Sep 2020 01:45:52 +0000 (18:45 -0700)]
Locally link and remove unused funcs stack/btm/btm_ble_addr
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I38adcdc582a3330e2fab95310e5e706fa40e8c0d
Chris Manton [Sun, 20 Sep 2020 01:33:06 +0000 (18:33 -0700)]
Remove unnecessary declarations stack/btm/btm_ble_int
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I53c769dff909d282c57e558f69086fe4fa670e35
Chris Manton [Sun, 20 Sep 2020 01:11:32 +0000 (18:11 -0700)]
Remove duplicate decls
Also in: stack/btm/btm_ble_int
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: Id033e59c15e26fbba35294a2a148296f0f69e790
Chris Manton [Thu, 24 Sep 2020 06:11:30 +0000 (23:11 -0700)]
Add bta/sys/bta_sys::BtaIdSysText()
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: Ie2bde0d4b46e3721d8523fa9293ddbc97e4e1fd2
Chris Manton [Thu, 24 Sep 2020 18:18:41 +0000 (11:18 -0700)]
Re-log parts of btif/src/btif_storage
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I2d2a3a44037a132f2361acb36d039e9d8c757c8d
Chris Manton [Thu, 24 Sep 2020 18:17:57 +0000 (11:17 -0700)]
Re-log parts of btif/src/btif_sock_thread
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I455eba51f92a8185997fefc88fad4bfffc36cd0e
Chris Manton [Thu, 24 Sep 2020 18:16:55 +0000 (11:16 -0700)]
Re-log btif/src/btif_sock_rfc::btsock_rfc_listen
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ie7839827710efa59e6181fd34cc7d1e4a3aad3cd
Chris Manton [Wed, 30 Sep 2020 18:41:15 +0000 (18:41 +0000)]
L2cap CoC callback use Confirm not Ind on server am:
5ba9d7c05d am:
8bb2a9a2c7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1442318
Change-Id: I889f4ab688d32d87f134cac96dde5b46a6e5639d
Chris Manton [Wed, 30 Sep 2020 18:29:20 +0000 (18:29 +0000)]
L2cap CoC callback use Confirm not Ind on server am:
5ba9d7c05d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1442318
Change-Id: I5329aca4e6c6068815f9669ddea4ce92038b38ef
Martin Brabham [Tue, 29 Sep 2020 23:34:05 +0000 (16:34 -0700)]
CertSecurity: Add missing events to registration
Bug:
169707911
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: Id28bcad19a0ee58e5127b47f52a6935d96bd6c67
Jakub Pawlowski [Wed, 30 Sep 2020 17:21:38 +0000 (19:21 +0200)]
Store LE device keys when bonded
Bug:
142341141
Tag: #gd-refactor
Test: Pair LE device with phone, confirm that keys are in storage
Change-Id: Ia69b10dac9516d460faa26f2aae769fcfbae8780
Chris Manton [Wed, 30 Sep 2020 04:26:24 +0000 (21:26 -0700)]
L2cap CoC callback use Confirm not Ind on server
Confirm is nullptr on L2cap connect-only-services
Bug:
169725013
Test: act.py -tc BleCocTest
Tag: #refactor
Change-Id: I5c87923a2b721c3d5b87d52969552382a5b1d633
Dan Shi [Wed, 30 Sep 2020 00:49:51 +0000 (00:49 +0000)]
Remove net_test_bta from TEST_MAPPING file am:
00bb094b4e am:
56f4bd0c5d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1442244
Change-Id: I82cefc91f9cf1f01d011e7860232f86579e542be
Dan Shi [Wed, 30 Sep 2020 00:30:27 +0000 (00:30 +0000)]
Remove net_test_bta from TEST_MAPPING file am:
00bb094b4e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1442244
Change-Id: I0c582d20c422a26ed78feb1d57cc3dd9b61bdf3b
Dan Shi [Tue, 29 Sep 2020 23:31:48 +0000 (16:31 -0700)]
Remove net_test_bta from TEST_MAPPING file
The test is device only test.
Bug:
169705178
Test: none
Change-Id: I19b6fdf5ff5e197380f5406563903f685e7a3d78
Treehugger Robot [Tue, 29 Sep 2020 19:43:49 +0000 (19:43 +0000)]
Merge changes Iefb88b7e,Ia8fd678c,Ieefd35fa,Ib474f0be,I16606384, ... am:
a560910b82 am:
d10f56e4f9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440280
Change-Id: I12961461ebc4829a74dcefc2f12aa0dd60ae8704
Sal Savage [Tue, 29 Sep 2020 19:01:45 +0000 (12:01 -0700)]
Properly update config when the MAC Address changes
The existing code has two issues:
- We pass a 0 size value for the buffer we intend to contain the value
we're getting. This causes btif_config_get_str to always return
positively but never write a value because its usage of srtlcpy doesn't
think it has space to write.
- We check to see if the address in the config is the same as the one
received from the controller using (strcmp(...) == 0). However, strcmp
returns 0 if they are the same. It will be a non-zero value if they are
different.
Following this change, the bt_config.conf file should have the correct
value for the MAC Address in the case the controller interface starts
reporting something new.
Bug:
169686820
Test: setprop persist.vendor.service.bdroid.bdaddr <something new>; cat
/data/misc/bluedroid/bt_config.conf | grep Address;
Change-Id: I6cdb70776fef689426baf58be0ccaf4abe9c9023