OSDN Git Service
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
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
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: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 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: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 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: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 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: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: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
Treehugger Robot [Fri, 2 Oct 2020 23:30:05 +0000 (23:30 +0000)]
Merge "Convert mask types from uint32_t to enum type"
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
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
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
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
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
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
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
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
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
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
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
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
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: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: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 [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 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