OSDN Git Service
Chris Manton [Mon, 5 Oct 2020 19:01:09 +0000 (19:01 +0000)]
Include security_device_record stack/acl/btm_acl am:
483c5d9a21 am:
505967f919 am:
316e1f3209
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448159
Change-Id: I6aec0309720d5b7f214d1b94522866dc0130b01a
Chris Manton [Mon, 5 Oct 2020 19:01:06 +0000 (19:01 +0000)]
Remove unused defs BTM_ACL_PKT_TYPES_MASK_ am:
e937ff70f0 am:
6cb0221bf4 am:
c4b4dab3d8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448158
Change-Id: Id8f6dc7e99b04a79be5ed4168d622137639aa625
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 [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 10:02:40 +0000 (10:02 +0000)]
log tgatt status properly am:
d5e1f52c7a am:
58aa83d5b1 am:
288cdb4bae am:
7fe345825c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448156
Change-Id: Ice4bfd6cf8c28410c1ac22539a4b3f597eef3b13
Chris Manton [Mon, 5 Oct 2020 10:01:32 +0000 (10:01 +0000)]
encapsulate tBTM_BOND_TYPE within tBTM_SEC_DEV_REC am:
52ac9da327 am:
002ee248f5 am:
b217240469 am:
478660fc74
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1421037
Change-Id: Ie6a16e21a23e6aca19ec3e3e54edcf4abe2c1969
Chris Manton [Mon, 5 Oct 2020 10:01:28 +0000 (10:01 +0000)]
Properly add typedef for gatt status am:
0fb7cc4885 am:
891ba8f5ee am:
8a851220cb am:
e47d1e6f93
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448155
Change-Id: Ifd1d59782c5764596d72e5e692b7f77c1f4d3c50
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 01:05:01 +0000 (01:05 +0000)]
Merge "GD Security: Fix bad conditional" am:
23bc14bf07 am:
2bdfba761f am:
97f522bbe9 am:
aac0fdcc7c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446997
Change-Id: I1753ab613e36e10222a245c2fc7352bda7ffc2b9
Chris Manton [Sun, 4 Oct 2020 01:04:54 +0000 (01:04 +0000)]
Add include stack/smp/smp_act::smp_api_types.h am:
a5d60f57d9 am:
2c67836827 am:
01759b7b97 am:
1794d771b1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1426431
Change-Id: Ia5df4bbf323c55152e208e3f49568f4426b12626
Chris Manton [Sun, 4 Oct 2020 01:04:34 +0000 (01:04 +0000)]
Encapulate tBTM_SEC_DEV_REC::pin_code_length am:
c0358734f2 am:
ba013b182e am:
fb2e3fbd89 am:
c82a8e7672
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446770
Change-Id: I0a926990b8530fa8483400f3c53550699365ff56
Chris Manton [Sun, 4 Oct 2020 01:04:32 +0000 (01:04 +0000)]
Wrap API around tBTM_SEC_DEV_REC::BTM_SEC_ am:
99d84b1f8b am:
819f8fca2c am:
d70d4dd261 am:
bd4cb6d798
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446769
Change-Id: Ibe92abddf1ebc2ab44302fad243c09a757b7b30c
Chris Manton [Sun, 4 Oct 2020 01:04:30 +0000 (01:04 +0000)]
Re-log btif/src/btif_sdp_server:: am:
2d423fbf1d am:
b6b0afdd11 am:
502ae07c02 am:
afccb644be
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446768
Change-Id: I805780745e12ebd7dd8cb2d4b9276c2a23b224bc
Chris Manton [Sun, 4 Oct 2020 01:04:28 +0000 (01:04 +0000)]
Remove unused decls stack/btm/btm_int am:
ef095485d2 am:
5a22251a7c am:
daf125a6c2 am:
d2d9a46b10
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446767
Change-Id: Iefa0e49f5321c20bdf02a9d6da17dc29e5a5f63c
Chris Manton [Sun, 4 Oct 2020 01:04:26 +0000 (01:04 +0000)]
enum-ify BTM_SEC_ and BTM_SEC_LE am:
6a231f9b75 am:
5e4c2d1d90 am:
b0ce312c74 am:
b1db423c4b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446766
Change-Id: I8cc5f03b578ca996e8271b8d3da3101532739440
Chris Manton [Sun, 4 Oct 2020 01:04:24 +0000 (01:04 +0000)]
Remove unused var tBTM_CB::state_temp_buffer am:
ea115fe4f9 am:
8355ea5411 am:
b0f5baeb2e am:
f61be5a352
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446765
Change-Id: I3c70bd83162ce8c63329ecc27e4d81b0fdfc1a16
Chris Manton [Sun, 4 Oct 2020 01:04:21 +0000 (01:04 +0000)]
Encapsulate tBTM_CB::btm_scn am:
d6e3ce8d7b am:
48da3842f9 am:
3388a2b755 am:
a757b66b77
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446764
Change-Id: I1caa8e70c88e53d8f8ebbed5dec7caff77fc2eb7
Chris Manton [Sun, 4 Oct 2020 01:04:19 +0000 (01:04 +0000)]
Encapsulate tBTM_CB::enc_rand, ediv, key_size am:
829451f652 am:
f9757fd5b3 am:
4d8d759494 am:
215088b7e3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446763
Change-Id: I153cbc37830fa1476230b886f08efab24c0e892a
Chris Manton [Sun, 4 Oct 2020 01:04:17 +0000 (01:04 +0000)]
Encapsulate tBTM_CB::enc_handle am:
ddf998bdd8 am:
08b983a655 am:
74501a19f8 am:
c2d45c25e8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446762
Change-Id: I091b20996dabe544382db065e01426460ca9176b
Chris Manton [Sun, 4 Oct 2020 01:04:16 +0000 (01:04 +0000)]
L2CA_SetFlushTimeout does nothing. am:
928e707151 am:
b94da5c908 am:
c6bb2cceec am:
e93ed78a96
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446771
Change-Id: Iba472229dc47275f05ff69362ff4d4fbf8c08d09
Chris Manton [Sun, 4 Oct 2020 01:04:12 +0000 (01:04 +0000)]
Re-align read remote version information on legacy am:
2c0a6c7825 am:
0ed186f937 am:
5a09376f10 am:
accabd0cd3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446761
Change-Id: I0f1470b1635838b1f6a8511c212c84a36ed1da6b
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
Chris Manton [Sun, 4 Oct 2020 00:34:58 +0000 (00:34 +0000)]
Re-log btif/src/btif_sdp_server:: am:
2d423fbf1d am:
b6b0afdd11 am:
502ae07c02
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446768
Change-Id: Iddf9538027c13fb124caffe87fbc9ecf7f7fbbb9
Chris Manton [Sun, 4 Oct 2020 00:34:56 +0000 (00:34 +0000)]
Remove unused decls stack/btm/btm_int am:
ef095485d2 am:
5a22251a7c am:
daf125a6c2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446767
Change-Id: Iffec1a0c67af3419f9b9bf4ce89c10302bf0ae3c
Chris Manton [Sun, 4 Oct 2020 00:34:54 +0000 (00:34 +0000)]
enum-ify BTM_SEC_ and BTM_SEC_LE am:
6a231f9b75 am:
5e4c2d1d90 am:
b0ce312c74
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446766
Change-Id: Ie1827393fa2fe59113142bcb23d22b42f9410b5c
Chris Manton [Sun, 4 Oct 2020 00:34:52 +0000 (00:34 +0000)]
Remove unused var tBTM_CB::state_temp_buffer am:
ea115fe4f9 am:
8355ea5411 am:
b0f5baeb2e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446765
Change-Id: Idb5911848668643f7ed38ef35d7712f18d5dd5dd
Chris Manton [Sun, 4 Oct 2020 00:34:50 +0000 (00:34 +0000)]
Encapsulate tBTM_CB::btm_scn am:
d6e3ce8d7b am:
48da3842f9 am:
3388a2b755
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446764
Change-Id: Ibfd8ae6cb19dd7fe50c0a19d9f8100fd9b6cccce
Chris Manton [Sun, 4 Oct 2020 00:34:48 +0000 (00:34 +0000)]
Encapsulate tBTM_CB::enc_rand, ediv, key_size am:
829451f652 am:
f9757fd5b3 am:
4d8d759494
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446763
Change-Id: Iab4d11888495ef0f8eba83b24eef55c02225ab0b
Chris Manton [Sun, 4 Oct 2020 00:34:46 +0000 (00:34 +0000)]
Encapsulate tBTM_CB::enc_handle am:
ddf998bdd8 am:
08b983a655 am:
74501a19f8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446762
Change-Id: I9595ee41d07e95ca8095d20c26c8d0e22e106565
Chris Manton [Sun, 4 Oct 2020 00:34:44 +0000 (00:34 +0000)]
L2CA_SetFlushTimeout does nothing. am:
928e707151 am:
b94da5c908 am:
c6bb2cceec
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446771
Change-Id: I47ecd8baa9a3c45b3ddf7cef927eb7b7a0e30846
Chris Manton [Sun, 4 Oct 2020 00:34:42 +0000 (00:34 +0000)]
Re-align read remote version information on legacy am:
2c0a6c7825 am:
0ed186f937 am:
5a09376f10
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446761
Change-Id: Ie1a064cabb7f728d99555a9464aa8666b68114f4
Treehugger Robot [Sun, 4 Oct 2020 00:01:52 +0000 (00:01 +0000)]
Merge "GD Security: Fix bad conditional" am:
23bc14bf07 am:
2bdfba761f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446997
Change-Id: Ib25b32ed2a071578a1f3a1e2dcd7e1cfbf97639a
Chris Manton [Sun, 4 Oct 2020 00:01:46 +0000 (00:01 +0000)]
Add include stack/smp/smp_act::smp_api_types.h am:
a5d60f57d9 am:
2c67836827
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1426431
Change-Id: I69ed3bd5a4c9dc187c273b4ebdca603822dda7ad
Chris Manton [Sun, 4 Oct 2020 00:01:33 +0000 (00:01 +0000)]
Encapulate tBTM_SEC_DEV_REC::pin_code_length am:
c0358734f2 am:
ba013b182e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446770
Change-Id: I5f0fb66d9ed5234f59a9b9f2c3fd9c74f7badc74
Chris Manton [Sun, 4 Oct 2020 00:01:31 +0000 (00:01 +0000)]
Wrap API around tBTM_SEC_DEV_REC::BTM_SEC_ am:
99d84b1f8b am:
819f8fca2c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446769
Change-Id: Ife09912905a28628ac5340bdb39e3cad36ec7f55
Chris Manton [Sun, 4 Oct 2020 00:01:29 +0000 (00:01 +0000)]
Re-log btif/src/btif_sdp_server:: am:
2d423fbf1d am:
b6b0afdd11
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446768
Change-Id: I9f228b171851f8679825b2938f5006d5821d2575
Chris Manton [Sun, 4 Oct 2020 00:01:27 +0000 (00:01 +0000)]
Remove unused decls stack/btm/btm_int am:
ef095485d2 am:
5a22251a7c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446767
Change-Id: Ib33119412faf5e6e6a03eed5901ab1b1716c37f8
Chris Manton [Sun, 4 Oct 2020 00:01:25 +0000 (00:01 +0000)]
enum-ify BTM_SEC_ and BTM_SEC_LE am:
6a231f9b75 am:
5e4c2d1d90
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446766
Change-Id: I77a6584781d086de7b620244d66c49dfca4be2c4
Chris Manton [Sun, 4 Oct 2020 00:01:23 +0000 (00:01 +0000)]
Remove unused var tBTM_CB::state_temp_buffer am:
ea115fe4f9 am:
8355ea5411
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446765
Change-Id: I3f75fd5cbc59f88a93b9fe986c0bb9ebde0ebe5b
Chris Manton [Sun, 4 Oct 2020 00:01:20 +0000 (00:01 +0000)]
Encapsulate tBTM_CB::btm_scn am:
d6e3ce8d7b am:
48da3842f9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446764
Change-Id: I09fbaf4d3d6db459a01ec4cfaf8a1a00a5fdadc1
Chris Manton [Sun, 4 Oct 2020 00:01:18 +0000 (00:01 +0000)]
Encapsulate tBTM_CB::enc_rand, ediv, key_size am:
829451f652 am:
f9757fd5b3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446763
Change-Id: I90a56480adcad63e213dc741f0318b0c49d90936
Chris Manton [Sun, 4 Oct 2020 00:01:16 +0000 (00:01 +0000)]
Encapsulate tBTM_CB::enc_handle am:
ddf998bdd8 am:
08b983a655
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446762
Change-Id: Ic83e1477ce42cef3b565cd84b7b8ff9997cafeeb
Chris Manton [Sun, 4 Oct 2020 00:01:14 +0000 (00:01 +0000)]
L2CA_SetFlushTimeout does nothing. am:
928e707151 am:
b94da5c908
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446771
Change-Id: Ia16675f89e3ca84c97b1f72d8e24b02b5163a602
Chris Manton [Sun, 4 Oct 2020 00:01:12 +0000 (00:01 +0000)]
Re-align read remote version information on legacy am:
2c0a6c7825 am:
0ed186f937
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446761
Change-Id: I039ee6270e231dc5d4d97d47493c5a3cc501ad48
Treehugger Robot [Sun, 4 Oct 2020 00:01:01 +0000 (00:01 +0000)]
Merge "GD Security: Fix bad conditional" am:
23bc14bf07
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446997
Change-Id: Ia4172485560ae29acde720f8e315ed41a362aadd
Treehugger Robot [Sat, 3 Oct 2020 23:57:33 +0000 (23:57 +0000)]
Merge "GD Security: Fix bad conditional"
Chris Manton [Sat, 3 Oct 2020 23:44:33 +0000 (23:44 +0000)]
Add include stack/smp/smp_act::smp_api_types.h am:
a5d60f57d9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1426431
Change-Id: I3ec6758f631ca8586b0896118100190470264369
Chris Manton [Sat, 3 Oct 2020 23:44:19 +0000 (23:44 +0000)]
Encapulate tBTM_SEC_DEV_REC::pin_code_length am:
c0358734f2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446770
Change-Id: Ib1160bd01dc559b829b62f2823d639b184fcc580
Chris Manton [Sat, 3 Oct 2020 23:44:16 +0000 (23:44 +0000)]
Wrap API around tBTM_SEC_DEV_REC::BTM_SEC_ am:
99d84b1f8b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446769
Change-Id: I0ecfce444a8d0738fde2ff9177348aa81dbffa02
Chris Manton [Sat, 3 Oct 2020 23:44:13 +0000 (23:44 +0000)]
Re-log btif/src/btif_sdp_server:: am:
2d423fbf1d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446768
Change-Id: I02a280c1869ad6e0c109dbe272471f9591992242
Chris Manton [Sat, 3 Oct 2020 23:44:10 +0000 (23:44 +0000)]
Remove unused decls stack/btm/btm_int am:
ef095485d2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446767
Change-Id: I9290826abfe601ad31ea35125a0d11eb48d50c27
Chris Manton [Sat, 3 Oct 2020 23:44:07 +0000 (23:44 +0000)]
enum-ify BTM_SEC_ and BTM_SEC_LE am:
6a231f9b75
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446766
Change-Id: I4218c4dc168fb954f2e41a76243f12470cc9680b
Chris Manton [Sat, 3 Oct 2020 23:44:04 +0000 (23:44 +0000)]
Remove unused var tBTM_CB::state_temp_buffer am:
ea115fe4f9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446765
Change-Id: If0893c1acdc32b705f1079baabe3df8846e62fb7
Chris Manton [Sat, 3 Oct 2020 23:44:01 +0000 (23:44 +0000)]
Encapsulate tBTM_CB::btm_scn am:
d6e3ce8d7b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446764
Change-Id: I8ab322ab8de370a948d02c013f7ed653a9da75b1
Chris Manton [Sat, 3 Oct 2020 23:43:58 +0000 (23:43 +0000)]
Encapsulate tBTM_CB::enc_rand, ediv, key_size am:
829451f652
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446763
Change-Id: I9dfdee968a86275055b72df5080e69859bc977e2
Chris Manton [Sat, 3 Oct 2020 23:43:54 +0000 (23:43 +0000)]
Encapsulate tBTM_CB::enc_handle am:
ddf998bdd8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446762
Change-Id: I33c4b30837443b28da57fd176c3bb6bac5a7a917
Chris Manton [Sat, 3 Oct 2020 23:43:51 +0000 (23:43 +0000)]
L2CA_SetFlushTimeout does nothing. am:
928e707151
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446771
Change-Id: I94343d6e59b0f43f2ae2ad816c2ac5635fb8bb5b
Chris Manton [Sat, 3 Oct 2020 23:43:11 +0000 (23:43 +0000)]
Re-align read remote version information on legacy am:
2c0a6c7825
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446761
Change-Id: Id708d38839dbf2d8e7187f24930aefc2bd4f6acb
Martin Brabham [Fri, 2 Oct 2020 19:03:34 +0000 (12:03 -0700)]
GD Security: Fix bad conditional
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Change-Id: I87bb3ac3ae7ccfc8164cf8565eb1e88f2f44e2d6
Chris Manton [Sun, 13 Sep 2020 22:39:15 +0000 (15:39 -0700)]
Add include stack/smp/smp_act::smp_api_types.h
Include what you use
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1de6caf318d75776ac2dbc5456ea32e287622d39
Chris Manton [Sun, 20 Sep 2020 23:25:17 +0000 (16:25 -0700)]
Encapulate tBTM_SEC_DEV_REC::pin_code_length
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ic48c5e60495b4308bf6c7b26e9de18745453bed8
Chris Manton [Sun, 20 Sep 2020 20:45:43 +0000 (13:45 -0700)]
Wrap API around tBTM_SEC_DEV_REC::BTM_SEC_
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I3e337b78e2ba7ed2eb2cf328d6b03c43a998fef4
Chris Manton [Thu, 24 Sep 2020 18:15:58 +0000 (11:15 -0700)]
Re-log btif/src/btif_sdp_server::
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ia57c281cc844a4c254c53324a4c4bd1eaf7af1c3
Chris Manton [Sun, 20 Sep 2020 22:20:48 +0000 (15:20 -0700)]
Remove unused decls stack/btm/btm_int
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: If3c47ffa09fa458a381a381cddc6f37a9835f7a4
Chris Manton [Sun, 20 Sep 2020 20:10:11 +0000 (13:10 -0700)]
enum-ify BTM_SEC_ and BTM_SEC_LE
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ifde2b62d2e368188d3454236b616adc2ca9dfcce
Chris Manton [Sun, 20 Sep 2020 20:14:00 +0000 (13:14 -0700)]
Remove unused var tBTM_CB::state_temp_buffer
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I2b6ffcae31b3b6fea84e59fac01962609557217b
Chris Manton [Sun, 20 Sep 2020 19:46:31 +0000 (12:46 -0700)]
Encapsulate tBTM_CB::btm_scn
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ic947434651ba3312342507ac1ff4da92e176b0bb
Chris Manton [Sun, 20 Sep 2020 16:13:26 +0000 (09:13 -0700)]
Encapsulate tBTM_CB::enc_rand, ediv, key_size
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I7e5962356b64b52011e370deb03b53a2ca4b42ad
Chris Manton [Sun, 20 Sep 2020 16:01:13 +0000 (09:01 -0700)]
Encapsulate tBTM_CB::enc_handle
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I735a002c545f62ae75676e72d068a2f3d097eda9
Chris Manton [Sat, 3 Oct 2020 20:19:51 +0000 (13:19 -0700)]
L2CA_SetFlushTimeout does nothing.
aosp/
1443546
Bug:
159815595
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ib18923477830f5f5bf2c8748da5a817a9871ec1e
Chris Manton [Sat, 3 Oct 2020 17:01:53 +0000 (10:01 -0700)]
Re-align read remote version information on legacy
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I7be1ecba73234431194ad9702ec3ea06b09c60bc
Treehugger Robot [Sat, 3 Oct 2020 02:18:20 +0000 (02:18 +0000)]
Merge changes Ib1f71d7e,I917ba220,Ic58e879c,If152037d,I063d0092 am:
75710e9095 am:
e55d8e607d am:
2e9ab14058 am:
d3844f71c0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443581
Change-Id: I3df16624bc34baff60de7f02e555551482519385
Treehugger Robot [Sat, 3 Oct 2020 02:04:00 +0000 (02:04 +0000)]
Merge changes Ib1f71d7e,I917ba220,Ic58e879c,If152037d,I063d0092 am:
75710e9095 am:
e55d8e607d am:
2e9ab14058
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443581
Change-Id: I7451d8863a50098073e803577ee084d541c2d490
Treehugger Robot [Sat, 3 Oct 2020 01:15:13 +0000 (01:15 +0000)]
Merge changes Ib1f71d7e,I917ba220,Ic58e879c,If152037d,I063d0092 am:
75710e9095 am:
e55d8e607d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443581
Change-Id: I42767803a1f0c1dd9b605fe8332fa3d31d0b94dc
Treehugger Robot [Sat, 3 Oct 2020 01:12:38 +0000 (01:12 +0000)]
Merge "Convert mask types from uint32_t to enum type" am:
23536aebcb am:
646c2db933 am:
3b20f802e9 am:
86305dcb48
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446998
Change-Id: Iea05b230aebf9a1439594dfb06d401f701252c90
Treehugger Robot [Sat, 3 Oct 2020 01:01:18 +0000 (01:01 +0000)]
Merge changes Ib1f71d7e,I917ba220,Ic58e879c,If152037d,I063d0092 am:
75710e9095
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443581
Change-Id: I2bb6be2e34529f6df81a531dc4ed7e86f614b18e
Treehugger Robot [Sat, 3 Oct 2020 00:55:12 +0000 (00:55 +0000)]
Merge "Convert mask types from uint32_t to enum type" am:
23536aebcb am:
646c2db933 am:
3b20f802e9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446998
Change-Id: I9067e3d991b54a28f871f01a52ab14d53fb77952
Treehugger Robot [Sat, 3 Oct 2020 00:46:19 +0000 (00:46 +0000)]
Merge changes Ib1f71d7e,I917ba220,Ic58e879c,If152037d,I063d0092
* changes:
Precise naming match => is_in_security_db
enum-ify _SCAN both classic and ble
enum-ify _INQUIRY both classic and ble
enum-ify _CONNECTABLE both classic and ble
enum-ify _DISCOVERABLE both classic and ble
Treehugger Robot [Sat, 3 Oct 2020 00:36:00 +0000 (00:36 +0000)]
Merge "Convert mask types from uint32_t to enum type" am:
23536aebcb am:
646c2db933
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446998
Change-Id: I59c1da34a7107db0342484a31171856e0beda024
Hansong Zhang [Sat, 3 Oct 2020 00:35:32 +0000 (00:35 +0000)]
SMP: Assume L2cap tx completes immediately am:
8326b49c4c am:
e97dd91039 am:
d8262faed1 am:
a761e9213e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446136
Change-Id: I59e2bbc91c9afe0e7d89c5815fd3070fcdf727f4
Hansong Zhang [Sat, 3 Oct 2020 00:35:25 +0000 (00:35 +0000)]
L2cap: LE address type is not used am:
08a28c0cb7 am:
c3b821e919 am:
eeb9094cbf am:
8c45208ea2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443308
Change-Id: I0399e2d1bcbc7c39b4bdef251d42096297d7c6bc
Hansong Zhang [Sat, 3 Oct 2020 00:35:21 +0000 (00:35 +0000)]
Link flush timeout is unused am:
12a0975cd7 am:
3a9ff02ce7 am:
e7f5ba8eb5 am:
330ca7fa5a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443307
Change-Id: I9337eed95fc6c3792f5f06b73e31386ac4e23842