OSDN Git Service
Xin Li [Tue, 6 Oct 2020 21:15:47 +0000 (21:15 +0000)]
[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am:
822d747312 am:
064f2cd106 -s ours
am skip reason: Change-Id I1bd8713eecebc2bc3d919402b035987e06a2d4d3 with SHA-1
342cb328b6 is in history
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449399
Change-Id: Ic74e7f30ed12c2f8e22338321832c9a14ec0dd47
The Android Open Source Project [Tue, 6 Oct 2020 21:15:42 +0000 (21:15 +0000)]
[automerger skipped] DO NOT MERGE - Merge RP1A.201005.006 am:
9e1ebdf522 am:
bca07e22d0 -s ours
am skip reason: Change-Id I1bd8713eecebc2bc3d919402b035987e06a2d4d3 with SHA-1
342cb328b6 is in history
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449399
Change-Id: I63ddd1b3c81da071128e2db5ee4252d9817e9c1a
Xin Li [Tue, 6 Oct 2020 20:24:35 +0000 (20:24 +0000)]
Merge "DO NOT MERGE - Merge RP1A.201005.006" am:
822d747312
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449399
Change-Id: Ie5a10fc0a5ce58f2ee6494d5d8ee46b8f928873d
The Android Open Source Project [Tue, 6 Oct 2020 20:23:54 +0000 (20:23 +0000)]
DO NOT MERGE - Merge RP1A.201005.006 am:
9e1ebdf522
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449399
Change-Id: If1877b2c672daaec5e8b8b5cb191ffd9621d96c0
Xin Li [Tue, 6 Oct 2020 20:17:27 +0000 (20:17 +0000)]
Merge "DO NOT MERGE - Merge RP1A.201005.006"
Treehugger Robot [Tue, 6 Oct 2020 19:57:29 +0000 (19:57 +0000)]
Merge "bthal: Do not allow to initialize more than once" am:
38f08d2724 am:
7623685f83
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439972
Change-Id: I869b614734f1bf6d1218c48562cc38832cd76088
Chris Manton [Tue, 6 Oct 2020 19:57:19 +0000 (19:57 +0000)]
Properly shim controller flags am:
5a691a0901 am:
9b94d537b3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449737
Change-Id: I0aa15516b04270a245ab066d8b98d367b498cc01
Treehugger Robot [Tue, 6 Oct 2020 18:53:54 +0000 (18:53 +0000)]
Merge "bthal: Do not allow to initialize more than once" am:
38f08d2724
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439972
Change-Id: Ie58c10ceec2164864233b3f0dd22c82b33373a42
Chris Manton [Tue, 6 Oct 2020 18:52:42 +0000 (18:52 +0000)]
Properly shim controller flags am:
5a691a0901
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449737
Change-Id: I96b11a58c4ded5981fd79158618eae4b75824d13
Treehugger Robot [Tue, 6 Oct 2020 18:27:28 +0000 (18:27 +0000)]
Merge "bthal: Do not allow to initialize more than once"
The Android Open Source Project [Tue, 6 Oct 2020 04:00:27 +0000 (21:00 -0700)]
DO NOT MERGE - Merge RP1A.201005.006
Bug:
168212094
Merged-In: I1bd8713eecebc2bc3d919402b035987e06a2d4d3
Change-Id: I1be981905f9b5c60b9fc0071200116a368996e00
TreeHugger Robot [Tue, 6 Oct 2020 10:11:36 +0000 (10:11 +0000)]
Merge "Check Classic key before cross-key derivation" into qt-qpr1-dev am:
285caebef7 am:
ace3e37d8c am:
1ef4307051
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687759
Change-Id: I74cdba16343747c9dacf22d29d38233478db9890
Chris Manton [Tue, 6 Oct 2020 09:40:58 +0000 (09:40 +0000)]
Re-log stack/l2cap/l2c_ble::l2cble_conn_comp am:
8bfbb8ba24 am:
ec72bd5489
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449261
Change-Id: I22ca5b84ca1abbbe7f452fdb0af656ab850ff89e
Chris Manton [Tue, 6 Oct 2020 09:40:55 +0000 (09:40 +0000)]
Legacy ACL shim interface am:
035379ba7d am:
a86cb55518
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449260
Change-Id: I2e15a3779df045d8f1ed667213bd8a9b618bfa12
Chris Manton [Tue, 6 Oct 2020 09:40:54 +0000 (09:40 +0000)]
Remove unused #defs stack/include/hcidefs am:
95f188f34a am:
3ec7e11fca
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449259
Change-Id: Id8093328dae6121e5b5c862a3029c177cfabee97
Chris Manton [Tue, 6 Oct 2020 09:40:52 +0000 (09:40 +0000)]
Remove unused #defs stack/include/bt_types am:
b96d27a064 am:
689e4b3b26
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449258
Change-Id: I564ad3d456e12138aa6bf1168eceaae059b0175c
Chris Manton [Tue, 6 Oct 2020 09:40:49 +0000 (09:40 +0000)]
Remove unused var tBTM_SEC_DEV_REC::link_key_changed am:
593ddc1451 am:
0527033a36
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449257
Change-Id: I9f3434676f35963cb98601d92d2cdd21a4514bb2
Chris Manton [Tue, 6 Oct 2020 09:40:47 +0000 (09:40 +0000)]
Streamline stack/l2cap/l2c_ble::l2cble_notify_le_connection am:
9bc4e5285e am:
f1b54f2778
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449256
Change-Id: If041b5cfa862e2b317dff7a37463fdd0d8f97164
Chris Manton [Tue, 6 Oct 2020 09:40:44 +0000 (09:40 +0000)]
Add stack/include/bt_types::AddressTypeText am:
8d20e0414d am:
69d9a2ff82
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449255
Change-Id: I5da27bbb965bf3923f9746d72661a8021d558257
Chris Manton [Tue, 6 Oct 2020 09:40:42 +0000 (09:40 +0000)]
Re-Api stack/acl/btm_acl::btm_ble_get_acl_remote_addr am:
0b50fcee28 am:
45b5528677
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448175
Change-Id: I666630de7379a2c5639fc3b1817662430d732446
Chris Manton [Tue, 6 Oct 2020 09:40:40 +0000 (09:40 +0000)]
Re-log stack/acl/btm_acl am:
4ec5ab73b0 am:
b5ace3cfa1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448162
Change-Id: I2ac11d38ff7d13838e5d4805393247e8b638ecd5
Chris Manton [Tue, 6 Oct 2020 09:40:38 +0000 (09:40 +0000)]
Replace tBTA_LE_KEY_TYPE=>tBTM_LE_KEY_TYPE am:
9ef98020f1 am:
9b3ad0ca1d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448163
Change-Id: Ic1c15ff98813ffc60d8115c1f707c11eb74fb91d
Chris Manton [Tue, 6 Oct 2020 09:40:36 +0000 (09:40 +0000)]
Simplify StackAclBtmAcl::btm_bda_to_acl am:
f52496654c am:
0600c53de3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448161
Change-Id: I2cec0f0a477f64f52df99e3cb8015b1ec886de33
Chris Manton [Tue, 6 Oct 2020 09:40:33 +0000 (09:40 +0000)]
Internally link stack/acl/btm_acl::btm_ble_get_acl_remote_addr am:
95772843cb am:
1e73d70b45
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448160
Change-Id: Icb5e6edb270e391738db278375ea8fa579d6ff89
TreeHugger Robot [Tue, 6 Oct 2020 09:34:16 +0000 (09:34 +0000)]
Merge "Check Classic key before cross-key derivation" into qt-qpr1-dev am:
285caebef7 am:
ace3e37d8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687759
Change-Id: I431f6ba0eceff663fd358b8281ed462f4d0b0730
Chris Manton [Tue, 6 Oct 2020 09:04:37 +0000 (09:04 +0000)]
Re-log stack/l2cap/l2c_ble::l2cble_conn_comp am:
8bfbb8ba24
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449261
Change-Id: I7afeba21452f1df39a8a954449a6e57a30cb47db
Chris Manton [Tue, 6 Oct 2020 09:04:33 +0000 (09:04 +0000)]
Legacy ACL shim interface am:
035379ba7d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449260
Change-Id: Ia74a6217fcd7bcb1ff6bf983bae2d71b354862f3
Chris Manton [Tue, 6 Oct 2020 09:04:29 +0000 (09:04 +0000)]
Remove unused #defs stack/include/hcidefs am:
95f188f34a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449259
Change-Id: I7b6b15938feb86e90510997f5fcfd30d4b58ca8e
Chris Manton [Tue, 6 Oct 2020 09:04:25 +0000 (09:04 +0000)]
Remove unused #defs stack/include/bt_types am:
b96d27a064
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449258
Change-Id: Ic298f9707ecc60794a6345de458d95e5b1be803a
Chris Manton [Tue, 6 Oct 2020 09:04:21 +0000 (09:04 +0000)]
Remove unused var tBTM_SEC_DEV_REC::link_key_changed am:
593ddc1451
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449257
Change-Id: I4ff7ad5f1fdfb8a02576f4ccf132d8b5fae6d0fb
Chris Manton [Tue, 6 Oct 2020 09:04:17 +0000 (09:04 +0000)]
Streamline stack/l2cap/l2c_ble::l2cble_notify_le_connection am:
9bc4e5285e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449256
Change-Id: Ib576a2c869e8c9f630542167abc78a555a2bf578
Chris Manton [Tue, 6 Oct 2020 09:04:13 +0000 (09:04 +0000)]
Add stack/include/bt_types::AddressTypeText am:
8d20e0414d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449255
Change-Id: I7df1998d74f3a96d8e285b9c04fcede36d14ed58
Chris Manton [Tue, 6 Oct 2020 09:04:09 +0000 (09:04 +0000)]
Re-Api stack/acl/btm_acl::btm_ble_get_acl_remote_addr am:
0b50fcee28
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448175
Change-Id: Ibe8289128d4652458b3bb1b28272da51dfe24cc5
Chris Manton [Tue, 6 Oct 2020 09:04:05 +0000 (09:04 +0000)]
Re-log stack/acl/btm_acl am:
4ec5ab73b0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448162
Change-Id: Ia70167abb45e2b836aae8fe5b7033312aef3e386
Chris Manton [Tue, 6 Oct 2020 09:04:01 +0000 (09:04 +0000)]
Replace tBTA_LE_KEY_TYPE=>tBTM_LE_KEY_TYPE am:
9ef98020f1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448163
Change-Id: Id8ee2396961663244c7b1de5ff6f5f5a8536eb3c
Chris Manton [Tue, 6 Oct 2020 09:03:58 +0000 (09:03 +0000)]
Simplify StackAclBtmAcl::btm_bda_to_acl am:
f52496654c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448161
Change-Id: I2faf3cf4bac158baff419262060e9aee98bb6b4c
Chris Manton [Tue, 6 Oct 2020 09:03:25 +0000 (09:03 +0000)]
Internally link stack/acl/btm_acl::btm_ble_get_acl_remote_addr am:
95772843cb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448160
Change-Id: I4760a7d62ed76c895b14df6b8f5e44739428d02c
TreeHugger Robot [Tue, 6 Oct 2020 08:51:28 +0000 (08:51 +0000)]
Merge "Check Classic key before cross-key derivation" into qt-qpr1-dev am:
285caebef7
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687759
Change-Id: If5f3d6fc4f8b7f93144459e45ca8588cf47cf1fa
TreeHugger Robot [Tue, 6 Oct 2020 08:34:08 +0000 (08:34 +0000)]
Merge "Check Classic key before cross-key derivation" into qt-qpr1-dev
Chris Manton [Tue, 6 Oct 2020 00:32:51 +0000 (17:32 -0700)]
Properly shim controller flags
Bug:
166280067
Tag: #refactor
Test: gd/cert/run --host
Test: ble paired 2 phones
Test: act.py -tc BleCocTest
Change-Id: I7d311bda8d86ca87032d8a45d35ab4d00a5d4038
Chris Manton [Mon, 21 Sep 2020 20:57:11 +0000 (13:57 -0700)]
Re-log stack/l2cap/l2c_ble::l2cble_conn_comp
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I6dfd621e83868b36fdb1ac16825db8176600adb9
Chris Manton [Mon, 5 Oct 2020 17:07:15 +0000 (10:07 -0700)]
Legacy ACL shim interface
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I2aaa3459e9537a896b374aa2a3eac85aaf1ea30c
Chris Manton [Mon, 21 Sep 2020 15:20:28 +0000 (08:20 -0700)]
Remove unused #defs stack/include/hcidefs
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I6b657cf604fac0e3fdb4e51b071c02b451f6e95c
Chris Manton [Mon, 21 Sep 2020 00:41:54 +0000 (17:41 -0700)]
Remove unused #defs stack/include/bt_types
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Iff89e74e95d78fe5cf053ca20fead3076fd18cdf
Chris Manton [Sun, 20 Sep 2020 23:30:42 +0000 (16:30 -0700)]
Remove unused var tBTM_SEC_DEV_REC::link_key_changed
set-once-to-default-read-never
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ife93f8028096744171ae79f2d8608c87e352eff0
Chris Manton [Sat, 3 Oct 2020 16:22:57 +0000 (09:22 -0700)]
Streamline stack/l2cap/l2c_ble::l2cble_notify_le_connection
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I1ffb5df7acd8f616822ec3eeacef7d88d6dbc249
Chris Manton [Mon, 21 Sep 2020 21:00:48 +0000 (14:00 -0700)]
Add stack/include/bt_types::AddressTypeText
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I43b7c46837435ea544eb2e8c90ef981a3bdf3e2f
Chris Manton [Sun, 4 Oct 2020 22:03:38 +0000 (15:03 -0700)]
Re-Api stack/acl/btm_acl::btm_ble_get_acl_remote_addr
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1ba3ec9198e9832e323da0e8b6e604eb8c8c1c81
Chris Manton [Sun, 4 Oct 2020 01:13:17 +0000 (18:13 -0700)]
Re-log stack/acl/btm_acl
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Iaf187f592f23992451a741e48d6a9f3730de3f56
Chris Manton [Thu, 10 Sep 2020 03:32:52 +0000 (20:32 -0700)]
Replace tBTA_LE_KEY_TYPE=>tBTM_LE_KEY_TYPE
Towards the shortest path
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I9475559159475f9f9d81a921cf14c2db62be3839
Chris Manton [Sun, 16 Aug 2020 22:03:26 +0000 (15:03 -0700)]
Simplify StackAclBtmAcl::btm_bda_to_acl
Towards proper interfaces
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I6573f60cbf5e469fe780c6d5a4506c0dcd39f590
Chris Manton [Mon, 17 Aug 2020 04:55:20 +0000 (21:55 -0700)]
Internally link stack/acl/btm_acl::btm_ble_get_acl_remote_addr
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Id440b966613aaeb4b39ece7d4517a5158e823456
Chen Chen [Tue, 6 Oct 2020 05:35:00 +0000 (05:35 +0000)]
Check Classic key before cross-key derivation am:
992e25e6b9 am:
eec1a1e896 am:
212d730545 am:
6884783558 am:
b5b63154d7 am:
bf000ad36f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736893
Change-Id: Ie470345982e97a73679109a0cb24d8a4e8c55128
Chen Chen [Tue, 6 Oct 2020 05:34:54 +0000 (05:34 +0000)]
Check Classic key before cross-key derivation am:
da8aa68903 am:
85a7c65c28 am:
9407e4f700 am:
1db44e4aeb am:
9064df5235
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687761
Change-Id: I159b9679713ffce2d6ec010284af230e3739e07d
Chen Chen [Tue, 6 Oct 2020 05:34:48 +0000 (05:34 +0000)]
Check Classic key before cross-key derivation am:
d3521aa04a am:
364407c8d2 am:
aad205be66 am:
b9cab6c940
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687760
Change-Id: I451786aa4ed0616619a5d338211613c038c0f776
Chen Chen [Tue, 6 Oct 2020 05:13:29 +0000 (05:13 +0000)]
Check Classic key before cross-key derivation am:
992e25e6b9 am:
eec1a1e896 am:
212d730545 am:
6884783558 am:
b5b63154d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736893
Change-Id: I955b3e20f0675a18603f1888bf8775c91fc386f1
Chen Chen [Tue, 6 Oct 2020 05:13:20 +0000 (05:13 +0000)]
Check Classic key before cross-key derivation am:
da8aa68903 am:
85a7c65c28 am:
9407e4f700 am:
1db44e4aeb
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687761
Change-Id: I50dced972c7ac60abfe0fa3bd02e20d6fcca5cb2
Chen Chen [Tue, 6 Oct 2020 05:13:12 +0000 (05:13 +0000)]
Check Classic key before cross-key derivation am:
d3521aa04a am:
364407c8d2 am:
aad205be66
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687760
Change-Id: I2f9b0409b41e9cee0151e290b443ade2a7d6aaac
Chen Chen [Tue, 6 Oct 2020 04:38:13 +0000 (04:38 +0000)]
Check Classic key before cross-key derivation am:
992e25e6b9 am:
eec1a1e896 am:
212d730545 am:
6884783558
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736893
Change-Id: Ic22e35a189b734585ab561aeb0ce8d263297ba42
Chen Chen [Tue, 6 Oct 2020 04:38:04 +0000 (04:38 +0000)]
Check Classic key before cross-key derivation am:
da8aa68903 am:
85a7c65c28 am:
9407e4f700
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687761
Change-Id: Id279e08fa997f4c7eb748c2aeaf410f31e8860c5
Chen Chen [Tue, 6 Oct 2020 04:37:51 +0000 (04:37 +0000)]
Check Classic key before cross-key derivation am:
d3521aa04a am:
364407c8d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687760
Change-Id: I3df576be2b48b49834814309fa495ec6a975f460
Chen Chen [Tue, 6 Oct 2020 04:32:42 +0000 (04:32 +0000)]
Check Classic key before cross-key derivation am:
16146379ad am:
d82141f378
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12684514
Change-Id: I8922440190e1986809951b6e4dcf0e393b59776c
Chen Chen [Tue, 6 Oct 2020 04:20:30 +0000 (04:20 +0000)]
Check Classic key before cross-key derivation am:
992e25e6b9 am:
eec1a1e896 am:
212d730545
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736893
Change-Id: Ia482be10c8ac7372a4d36c557e740a83231b10ae
Chen Chen [Tue, 6 Oct 2020 04:20:24 +0000 (04:20 +0000)]
Check Classic key before cross-key derivation am:
da8aa68903 am:
85a7c65c28
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687761
Change-Id: I494f299169e329ece034da105c83e392a13dc875
Chen Chen [Tue, 6 Oct 2020 04:20:18 +0000 (04:20 +0000)]
Check Classic key before cross-key derivation am:
d3521aa04a
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687760
Change-Id: I93f154a331ecfdee704321bd3e94758c18005658
Chen Chen [Tue, 6 Oct 2020 04:15:32 +0000 (04:15 +0000)]
Check Classic key before cross-key derivation am:
16146379ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12684514
Change-Id: I5886396032be21a2e2230d2bbeb285c57fe1c68b
Chen Chen [Tue, 6 Oct 2020 03:59:41 +0000 (03:59 +0000)]
Check Classic key before cross-key derivation am:
992e25e6b9 am:
eec1a1e896
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736893
Change-Id: Icfc2e05b44e48cc1ee6dd4594877a85195ea15f0
Chen Chen [Tue, 6 Oct 2020 03:59:33 +0000 (03:59 +0000)]
Check Classic key before cross-key derivation am:
da8aa68903
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687761
Change-Id: I85a19b10f4f7ac9ec94811d022ed28b2e9a2b848
Chen Chen [Tue, 6 Oct 2020 03:59:17 +0000 (03:59 +0000)]
Check Classic key before cross-key derivation am:
992e25e6b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736893
Change-Id: I7bad5de1a8d79930b54c7075405b75ee466fc3fa
Treehugger Robot [Tue, 6 Oct 2020 03:15:49 +0000 (03:15 +0000)]
Merge "Remove init flags log message, you can check the dumpsys now" am:
30ddaf173d am:
43b9502f0f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1424973
Change-Id: I9836780e6f2b7dd837f3623ebb79588b6a1f1ef1
Treehugger Robot [Tue, 6 Oct 2020 02:57:56 +0000 (02:57 +0000)]
Merge "Remove init flags log message, you can check the dumpsys now" am:
30ddaf173d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1424973
Change-Id: I1e2e8cf1fb6c20d6e24f6cab2d3d27e4fbf0cff3
Treehugger Robot [Tue, 6 Oct 2020 02:31:40 +0000 (02:31 +0000)]
Merge "Remove init flags log message, you can check the dumpsys now"
Treehugger Robot [Tue, 6 Oct 2020 01:48:32 +0000 (01:48 +0000)]
Merge "Add A2DP/SDP fuzzers for bt-stack" am:
925f1f4d8f am:
3adf664f2b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1363800
Change-Id: I0d5d175ce07fefc5f3463af755ef42845a45c0e5
Treehugger Robot [Tue, 6 Oct 2020 01:16:20 +0000 (01:16 +0000)]
Merge "Add A2DP/SDP fuzzers for bt-stack" am:
925f1f4d8f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1363800
Change-Id: Id3eddc0b0d7fe1dc4977fea3dd4926f524cec74f
Treehugger Robot [Tue, 6 Oct 2020 00:58:46 +0000 (00:58 +0000)]
Merge "Add A2DP/SDP fuzzers for bt-stack"
Chris Manton [Mon, 5 Oct 2020 21:16:33 +0000 (21:16 +0000)]
enum-ify tgatt_status am:
80b80d3ec8 am:
a689ef2403
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448157
Change-Id: Ia559ea0ce03965e98b9edab8a791a89f0c676460
Chris Manton [Mon, 5 Oct 2020 20:53:31 +0000 (20:53 +0000)]
enum-ify tgatt_status am:
80b80d3ec8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448157
Change-Id: I967861e2eecdd4f7ee532b65d66e6986a92318c2
Chris Manton [Mon, 5 Oct 2020 18:38:36 +0000 (18:38 +0000)]
Include security_device_record stack/acl/btm_acl am:
483c5d9a21 am:
505967f919
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448159
Change-Id: Id382ea6bd39f4c79ff2d25adf1c7266c6f278057
Chris Manton [Mon, 5 Oct 2020 18:38:34 +0000 (18:38 +0000)]
Remove unused defs BTM_ACL_PKT_TYPES_MASK_ am:
e937ff70f0 am:
6cb0221bf4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448158
Change-Id: I734ebf3c5cc33bc0a2f2e573fb6c6022f55c572a
Chris Manton [Mon, 5 Oct 2020 18:20:33 +0000 (18:20 +0000)]
Include security_device_record stack/acl/btm_acl am:
483c5d9a21
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448159
Change-Id: I51cfa6a5703bee6f5db3ad2eb2c417d3ab2f8715
Chris Manton [Mon, 5 Oct 2020 18:19:58 +0000 (18:19 +0000)]
Remove unused defs BTM_ACL_PKT_TYPES_MASK_ am:
e937ff70f0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448158
Change-Id: Ie046295b529c989f9ffbe4d4b8abd662ec84b3b3
Chris Manton [Sun, 4 Oct 2020 17:09:34 +0000 (10:09 -0700)]
enum-ify tgatt_status
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I44a41dfbf11c1bbca77c8f568ed1ada236476d6f
Chris Manton [Mon, 17 Aug 2020 15:01:56 +0000 (08:01 -0700)]
Include security_device_record stack/acl/btm_acl
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I3b2ed7bd82dff9b504223aa9ea93a72a1c0575b7
Chris Manton [Sun, 16 Aug 2020 18:21:05 +0000 (11:21 -0700)]
Remove unused defs BTM_ACL_PKT_TYPES_MASK_
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I59f2004e5450834dcdc725f52942923aa5294fe4
Chris Manton [Mon, 5 Oct 2020 09:34:12 +0000 (09:34 +0000)]
log tgatt status properly am:
d5e1f52c7a am:
58aa83d5b1 am:
288cdb4bae
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448156
Change-Id: Id22d4652ce4637c454bb365d54b5449c53026a84
Chris Manton [Mon, 5 Oct 2020 09:33:30 +0000 (09:33 +0000)]
encapsulate tBTM_BOND_TYPE within tBTM_SEC_DEV_REC am:
52ac9da327 am:
002ee248f5 am:
b217240469
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1421037
Change-Id: I4b816661f8e77450200be06e5dcf26628dc39561
Chris Manton [Mon, 5 Oct 2020 09:33:26 +0000 (09:33 +0000)]
Properly add typedef for gatt status am:
0fb7cc4885 am:
891ba8f5ee am:
8a851220cb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448155
Change-Id: I382ce073cf8cd6766ceabc397a22b073e02264cb
Chris Manton [Mon, 5 Oct 2020 08:58:31 +0000 (08:58 +0000)]
log tgatt status properly am:
d5e1f52c7a am:
58aa83d5b1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448156
Change-Id: Ia8ec26888bdcf9152eeb606a99569cf21840f93f
Chris Manton [Mon, 5 Oct 2020 08:58:20 +0000 (08:58 +0000)]
encapsulate tBTM_BOND_TYPE within tBTM_SEC_DEV_REC am:
52ac9da327 am:
002ee248f5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1421037
Change-Id: Id8dbdc4dbd763cfd4eeb5f19ff3f64e8b4446a32
Chris Manton [Mon, 5 Oct 2020 08:58:17 +0000 (08:58 +0000)]
Properly add typedef for gatt status am:
0fb7cc4885 am:
891ba8f5ee
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448155
Change-Id: I1e5ff342a09eb3a42420bb0b05b60c6cdb73d732
Chris Manton [Mon, 5 Oct 2020 08:38:39 +0000 (08:38 +0000)]
log tgatt status properly am:
d5e1f52c7a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448156
Change-Id: If02db583f1e7eac5e462a35403f2dcb6d3baeb0f
Chris Manton [Mon, 5 Oct 2020 08:32:37 +0000 (08:32 +0000)]
encapsulate tBTM_BOND_TYPE within tBTM_SEC_DEV_REC am:
52ac9da327
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1421037
Change-Id: I54207f965ae34176312cc0bf10f581c1f9e54a32
Chris Manton [Mon, 5 Oct 2020 08:31:59 +0000 (08:31 +0000)]
Properly add typedef for gatt status am:
0fb7cc4885
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448155
Change-Id: Iaebf9ecfbcd5eb72c58ff5059b503ee32174ac5f
Chris Manton [Sun, 4 Oct 2020 06:47:35 +0000 (23:47 -0700)]
log tgatt status properly
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I5e4c526baca73a3c4e5e64a4b4bea4daab31116a
Chris Manton [Mon, 7 Sep 2020 19:51:18 +0000 (12:51 -0700)]
encapsulate tBTM_BOND_TYPE within tBTM_SEC_DEV_REC
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ia5e04ba5c05783ee6b7458989f1898c50db80584
Chris Manton [Sun, 4 Oct 2020 06:46:48 +0000 (23:46 -0700)]
Properly add typedef for gatt status
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I058946087572442b26a42e36076db273076c7518
Treehugger Robot [Sun, 4 Oct 2020 00:35:24 +0000 (00:35 +0000)]
Merge "GD Security: Fix bad conditional" am:
23bc14bf07 am:
2bdfba761f am:
97f522bbe9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446997
Change-Id: I55462da868e40529d22cc570c394b1ddb7b4492d
Chris Manton [Sun, 4 Oct 2020 00:35:17 +0000 (00:35 +0000)]
Add include stack/smp/smp_act::smp_api_types.h am:
a5d60f57d9 am:
2c67836827 am:
01759b7b97
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1426431
Change-Id: I6ebfda0066a55d0d000bf28e1a36c0215e82a081
Chris Manton [Sun, 4 Oct 2020 00:35:01 +0000 (00:35 +0000)]
Encapulate tBTM_SEC_DEV_REC::pin_code_length am:
c0358734f2 am:
ba013b182e am:
fb2e3fbd89
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446770
Change-Id: Ic3ba8c23b9f2a912225ffdd3ce05cdaf08757153
Chris Manton [Sun, 4 Oct 2020 00:34:59 +0000 (00:34 +0000)]
Wrap API around tBTM_SEC_DEV_REC::BTM_SEC_ am:
99d84b1f8b am:
819f8fca2c am:
d70d4dd261
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446769
Change-Id: I9f361475ac9f75e7e4bfcc9a8a03b50655cfb76d