OSDN Git Service

android-x86/system-bt.git
3 years agoRemove unused defs BTM_ACL_PKT_TYPES_MASK_ am: e937ff70f0 am: 6cb0221bf4
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

3 years agoRemove unused defs BTM_ACL_PKT_TYPES_MASK_ am: e937ff70f0
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

3 years agoRemove unused defs BTM_ACL_PKT_TYPES_MASK_
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

3 years agolog tgatt status properly am: d5e1f52c7a am: 58aa83d5b1 am: 288cdb4bae
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

3 years agoencapsulate tBTM_BOND_TYPE within tBTM_SEC_DEV_REC am: 52ac9da327 am: 002ee248f5...
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

3 years agoProperly add typedef for gatt status am: 0fb7cc4885 am: 891ba8f5ee am: 8a851220cb
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

3 years agolog tgatt status properly am: d5e1f52c7a am: 58aa83d5b1
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

3 years agoencapsulate tBTM_BOND_TYPE within tBTM_SEC_DEV_REC am: 52ac9da327 am: 002ee248f5
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

3 years agoProperly add typedef for gatt status am: 0fb7cc4885 am: 891ba8f5ee
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

3 years agolog tgatt status properly am: d5e1f52c7a
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

3 years agoencapsulate tBTM_BOND_TYPE within tBTM_SEC_DEV_REC am: 52ac9da327
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

3 years agoProperly add typedef for gatt status am: 0fb7cc4885
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

3 years agolog tgatt status properly
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

3 years agoencapsulate tBTM_BOND_TYPE within tBTM_SEC_DEV_REC
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

3 years agoProperly add typedef for gatt status
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

3 years agoMerge "GD Security: Fix bad conditional" am: 23bc14bf07 am: 2bdfba761f am: 97f522bbe9
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

3 years agoAdd include stack/smp/smp_act::smp_api_types.h am: a5d60f57d9 am: 2c67836827 am:...
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

3 years agoEncapulate tBTM_SEC_DEV_REC::pin_code_length am: c0358734f2 am: ba013b182e am: fb2e3fbd89
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

3 years agoWrap API around tBTM_SEC_DEV_REC::BTM_SEC_ am: 99d84b1f8b am: 819f8fca2c am: d70d4dd261
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

3 years agoRe-log btif/src/btif_sdp_server:: am: 2d423fbf1d am: b6b0afdd11 am: 502ae07c02
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

3 years agoRemove unused decls stack/btm/btm_int am: ef095485d2 am: 5a22251a7c am: daf125a6c2
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

3 years agoenum-ify BTM_SEC_ and BTM_SEC_LE am: 6a231f9b75 am: 5e4c2d1d90 am: b0ce312c74
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

3 years agoRemove unused var tBTM_CB::state_temp_buffer am: ea115fe4f9 am: 8355ea5411 am: b0f5baeb2e
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

3 years agoEncapsulate tBTM_CB::btm_scn am: d6e3ce8d7b am: 48da3842f9 am: 3388a2b755
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

3 years agoEncapsulate tBTM_CB::enc_rand, ediv, key_size am: 829451f652 am: f9757fd5b3 am: 4d8d7...
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

3 years agoEncapsulate tBTM_CB::enc_handle am: ddf998bdd8 am: 08b983a655 am: 74501a19f8
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

3 years agoL2CA_SetFlushTimeout does nothing. am: 928e707151 am: b94da5c908 am: c6bb2cceec
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

3 years agoRe-align read remote version information on legacy am: 2c0a6c7825 am: 0ed186f937...
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

3 years agoMerge "GD Security: Fix bad conditional" am: 23bc14bf07 am: 2bdfba761f
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

3 years agoAdd include stack/smp/smp_act::smp_api_types.h am: a5d60f57d9 am: 2c67836827
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

3 years agoEncapulate tBTM_SEC_DEV_REC::pin_code_length am: c0358734f2 am: ba013b182e
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

3 years agoWrap API around tBTM_SEC_DEV_REC::BTM_SEC_ am: 99d84b1f8b am: 819f8fca2c
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

3 years agoRe-log btif/src/btif_sdp_server:: am: 2d423fbf1d am: b6b0afdd11
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

3 years agoRemove unused decls stack/btm/btm_int am: ef095485d2 am: 5a22251a7c
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

3 years agoenum-ify BTM_SEC_ and BTM_SEC_LE am: 6a231f9b75 am: 5e4c2d1d90
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

3 years agoRemove unused var tBTM_CB::state_temp_buffer am: ea115fe4f9 am: 8355ea5411
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

3 years agoEncapsulate tBTM_CB::btm_scn am: d6e3ce8d7b am: 48da3842f9
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

3 years agoEncapsulate tBTM_CB::enc_rand, ediv, key_size am: 829451f652 am: f9757fd5b3
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

3 years agoEncapsulate tBTM_CB::enc_handle am: ddf998bdd8 am: 08b983a655
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

3 years agoL2CA_SetFlushTimeout does nothing. am: 928e707151 am: b94da5c908
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

3 years agoRe-align read remote version information on legacy am: 2c0a6c7825 am: 0ed186f937
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

3 years agoMerge "GD Security: Fix bad conditional" am: 23bc14bf07
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

3 years agoMerge "GD Security: Fix bad conditional"
Treehugger Robot [Sat, 3 Oct 2020 23:57:33 +0000 (23:57 +0000)]
Merge "GD Security: Fix bad conditional"

3 years agoAdd include stack/smp/smp_act::smp_api_types.h am: a5d60f57d9
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

3 years agoEncapulate tBTM_SEC_DEV_REC::pin_code_length am: c0358734f2
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

3 years agoWrap API around tBTM_SEC_DEV_REC::BTM_SEC_ am: 99d84b1f8b
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

3 years agoRe-log btif/src/btif_sdp_server:: am: 2d423fbf1d
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

3 years agoRemove unused decls stack/btm/btm_int am: ef095485d2
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

3 years agoenum-ify BTM_SEC_ and BTM_SEC_LE am: 6a231f9b75
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

3 years agoRemove unused var tBTM_CB::state_temp_buffer am: ea115fe4f9
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

3 years agoEncapsulate tBTM_CB::btm_scn am: d6e3ce8d7b
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

3 years agoEncapsulate tBTM_CB::enc_rand, ediv, key_size am: 829451f652
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

3 years agoEncapsulate tBTM_CB::enc_handle am: ddf998bdd8
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

3 years agoL2CA_SetFlushTimeout does nothing. am: 928e707151
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

3 years agoRe-align read remote version information on legacy am: 2c0a6c7825
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

3 years agoGD Security: Fix bad conditional
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

3 years agoAdd include stack/smp/smp_act::smp_api_types.h
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

3 years agoEncapulate tBTM_SEC_DEV_REC::pin_code_length
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

3 years agoWrap API around tBTM_SEC_DEV_REC::BTM_SEC_
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

3 years agoRe-log btif/src/btif_sdp_server::
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

3 years agoRemove unused decls stack/btm/btm_int
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

3 years agoenum-ify BTM_SEC_ and BTM_SEC_LE
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

3 years agoRemove unused var tBTM_CB::state_temp_buffer
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

3 years agoEncapsulate tBTM_CB::btm_scn
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

3 years agoEncapsulate tBTM_CB::enc_rand, ediv, key_size
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

3 years agoEncapsulate tBTM_CB::enc_handle
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

3 years agoL2CA_SetFlushTimeout does nothing.
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

3 years agoRe-align read remote version information on legacy
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

3 years agoMerge changes Ib1f71d7e,I917ba220,Ic58e879c,If152037d,I063d0092 am: 75710e9095 am...
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

3 years agoMerge changes Ib1f71d7e,I917ba220,Ic58e879c,If152037d,I063d0092 am: 75710e9095 am...
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

3 years agoMerge changes Ib1f71d7e,I917ba220,Ic58e879c,If152037d,I063d0092 am: 75710e9095
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

3 years agoMerge "Convert mask types from uint32_t to enum type" am: 23536aebcb am: 646c2db933...
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

3 years agoMerge changes Ib1f71d7e,I917ba220,Ic58e879c,If152037d,I063d0092
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

3 years agoMerge "Convert mask types from uint32_t to enum type" am: 23536aebcb am: 646c2db933
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

3 years agoSMP: Assume L2cap tx completes immediately am: 8326b49c4c am: e97dd91039 am: d8262faed1
Hansong Zhang [Sat, 3 Oct 2020 00:20:28 +0000 (00:20 +0000)]
SMP: Assume L2cap tx completes immediately am: 8326b49c4c am: e97dd91039 am: d8262faed1

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1446136

Change-Id: Ib53d88e40af2c8414c003ccf7cc2e226a9ca29d5

3 years agoMerge "Convert mask types from uint32_t to enum type" am: 23536aebcb
Treehugger Robot [Sat, 3 Oct 2020 00:20:18 +0000 (00:20 +0000)]
Merge "Convert mask types from uint32_t to enum type" am: 23536aebcb

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1446998

Change-Id: Ibd9ca304fde7ba2b3865bda0812208f50276551a

3 years agoL2cap: LE address type is not used am: 08a28c0cb7 am: c3b821e919 am: eeb9094cbf
Hansong Zhang [Sat, 3 Oct 2020 00:20:14 +0000 (00:20 +0000)]
L2cap: LE address type is not used am: 08a28c0cb7 am: c3b821e919 am: eeb9094cbf

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1443308

Change-Id: I224ae0f2b624e07e51046d826672f1e80858bdfd

3 years agoLink flush timeout is unused am: 12a0975cd7 am: 3a9ff02ce7 am: e7f5ba8eb5
Hansong Zhang [Sat, 3 Oct 2020 00:20:12 +0000 (00:20 +0000)]
Link flush timeout is unused am: 12a0975cd7 am: 3a9ff02ce7 am: e7f5ba8eb5

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1443307

Change-Id: I8abaf28b92d085c37287d8c97c8d03f81abc6a49

3 years agoSMP: Assume L2cap tx completes immediately am: 8326b49c4c am: e97dd91039
Hansong Zhang [Fri, 2 Oct 2020 23:36:24 +0000 (23:36 +0000)]
SMP: Assume L2cap tx completes immediately am: 8326b49c4c am: e97dd91039

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1446136

Change-Id: I286d312edb3cbdf0f67bf569bb21caf3025163da

3 years agoL2cap: LE address type is not used am: 08a28c0cb7 am: c3b821e919
Hansong Zhang [Fri, 2 Oct 2020 23:36:20 +0000 (23:36 +0000)]
L2cap: LE address type is not used am: 08a28c0cb7 am: c3b821e919

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1443308

Change-Id: I772391fe5bc80a71b94ee11a18617d2495ee40d3

3 years agoLink flush timeout is unused am: 12a0975cd7 am: 3a9ff02ce7
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

3 years agoMerge "Convert mask types from uint32_t to enum type"
Treehugger Robot [Fri, 2 Oct 2020 23:30:05 +0000 (23:30 +0000)]
Merge "Convert mask types from uint32_t to enum type"

3 years agoSMP: Assume L2cap tx completes immediately am: 8326b49c4c
Hansong Zhang [Fri, 2 Oct 2020 23:16:31 +0000 (23:16 +0000)]
SMP: Assume L2cap tx completes immediately am: 8326b49c4c

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1446136

Change-Id: I257fd78f2b5413d0858ccd3f1c073297e61f70bd

3 years agoL2cap: LE address type is not used am: 08a28c0cb7
Hansong Zhang [Fri, 2 Oct 2020 23:16:22 +0000 (23:16 +0000)]
L2cap: LE address type is not used am: 08a28c0cb7

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1443308

Change-Id: I41fe290dec074238a22c01100afd664640ffed16

3 years agoLink flush timeout is unused am: 12a0975cd7
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

3 years agoHIDH: Don't set a minimum MTU am: 85ef9c4772 am: c58fba31a3 am: 9c28d5e388
Myles Watson [Fri, 2 Oct 2020 23:13:59 +0000 (23:13 +0000)]
HIDH: Don't set a minimum MTU am: 85ef9c4772 am: c58fba31a3 am: 9c28d5e388

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1446995

Change-Id: I66ce7b6a772a11df61e5c50e1d150522b821d79d

3 years agoHIDH: Don't set a minimum MTU am: 85ef9c4772 am: c58fba31a3
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

3 years agoSMP: Assume L2cap tx completes immediately
Hansong Zhang [Fri, 2 Oct 2020 00:47:03 +0000 (17:47 -0700)]
SMP: Assume L2cap tx completes immediately

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5bf5c5067f3ad3d48716fdc65f73920107d034cf

3 years agoL2cap: LE address type is not used
Hansong Zhang [Thu, 1 Oct 2020 07:03:59 +0000 (00:03 -0700)]
L2cap: LE address type is not used

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie13f6e7cda6feb23d25ae661abeb7221757e9da7

3 years agoLink flush timeout is unused
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

3 years agoHIDH: Don't set a minimum MTU am: 85ef9c4772
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

3 years agoConvert mask types from uint32_t to enum type
Mikhail Naganov [Fri, 2 Oct 2020 01:08:16 +0000 (18:08 -0700)]
Convert mask types from uint32_t to enum type

This applies to the following types:

- audio_gain_mode_t;
- audio_flags_mask_t;
- audio_channel_representation_t;
- audio_channel_mask_t;
- audio_devices_t.

Enum types are distinct thus proper overloading on the type
is possible in C++. Also, assignments to enum types are
less prone to errors.

Bug: 169889714
Test: basic audio functionality
Tag: #refactor
Change-Id: I7b064b282ce9f533f91ef13a4852b3e9f308f6c0

3 years agoPrecise naming match => is_in_security_db
Chris Manton [Sun, 20 Sep 2020 15:43:57 +0000 (08:43 -0700)]
Precise naming match => is_in_security_db

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: Ib1f71d7e94ab471a04c25b74cfb8cda5fab3cef5

3 years agoenum-ify _SCAN both classic and ble
Chris Manton [Sun, 20 Sep 2020 06:29:24 +0000 (23:29 -0700)]
enum-ify _SCAN both classic and ble

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I917ba2204a79af800afefe1b7e046a9510316030

3 years agoenum-ify _INQUIRY both classic and ble
Chris Manton [Sun, 20 Sep 2020 06:21:23 +0000 (23:21 -0700)]
enum-ify _INQUIRY both classic and ble

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: Ic58e879c9b62fcba510111b178e0aa092873bcac

3 years agoenum-ify _CONNECTABLE both classic and ble
Chris Manton [Sun, 20 Sep 2020 05:50:58 +0000 (22:50 -0700)]
enum-ify _CONNECTABLE both classic and ble

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: If152037d43646197b456dfe6174bb897f4911c3a

3 years agoenum-ify _DISCOVERABLE both classic and ble
Chris Manton [Sun, 20 Sep 2020 05:36:56 +0000 (22:36 -0700)]
enum-ify _DISCOVERABLE both classic and ble

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I063d0092569663c25166f15d369b57e6bf88388d

3 years agoAdd ACL shim event registration - with deps am: 2f01df7224 am: c2a6ac2aad am: 03b237f8b7
Chris Manton [Fri, 2 Oct 2020 17:16:59 +0000 (17:16 +0000)]
Add ACL shim event registration - with deps am: 2f01df7224 am: c2a6ac2aad am: 03b237f8b7

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1446135

Change-Id: Ie141de370ea513fb481c7937691d727180ea6213

3 years agoSingle out Register events LE_META_EVENT as special am: f58215f418 am: 44f0621643...
Chris Manton [Fri, 2 Oct 2020 17:16:56 +0000 (17:16 +0000)]
Single out Register events LE_META_EVENT as special am: f58215f418 am: 44f0621643 am: 79715495b1

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1439640

Change-Id: I8521707e91c9b0db373de9238652c4434f4ff0d4

3 years agoAdd ACL shim event registration - with deps am: 2f01df7224 am: c2a6ac2aad
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