OSDN Git Service
Chris Manton [Tue, 9 Mar 2021 00:56:20 +0000 (00:56 +0000)]
Merge changes Ib81960bb,I1d84f463,Id475e310,I4ba9755c,Ib6f7b4ba, ... am:
28e8caaba8 am:
74be1cc019
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1621332
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icbcb10dd69f85428d03c12fa50991f2358cb1066
Chris Manton [Tue, 9 Mar 2021 00:41:51 +0000 (00:41 +0000)]
Merge changes Ib81960bb,I1d84f463,Id475e310,I4ba9755c,Ib6f7b4ba, ... am:
28e8caaba8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1621332
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I989c6bef6cf54667e59f9060e2a53455c5caffde
Hansong Zhang [Tue, 9 Mar 2021 00:38:26 +0000 (00:38 +0000)]
Add a way to connect to linux raw HCI HAL am:
6453e4a8e3 am:
cfb5a06e1d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1617700
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8053d69b08a1e3f2e47c3a45842199198c0c4f21
Chris Manton [Tue, 9 Mar 2021 00:19:34 +0000 (00:19 +0000)]
Merge changes Ib81960bb,I1d84f463,Id475e310,I4ba9755c,Ib6f7b4ba, ...
* changes:
Introduce main_shim_test
Add main/test::shim mocks
Add gd/neighbor::inquiry mock
Add SCO HACK for shim acl mock
Add gd/hci::controller mock
gd_acl: Directly access acl manager for SCO hack
Put stack vars in proper scope
Return proper type stack/acl/btm_pm::BTM_SetPowerMode
Explicitly specify status type include/hardware/ble_scanner.h
Add stack init indirection for activity_attribution
Use proper tBTM_STATUS types
Use tBTM_STATUS in stack/l2cap/::
gd_shim: Log more info about acl queue state
Add bta_sys post to main alternative method
Remove unused field srvc_id
Template prep for bta hardening
Use btm_status in stack/rfcomm/::
Use proper types tBLE_SCAN_MODE
User proper types tBTM_STATUS
Canonicalize tBTM_APPL_INFO::bta_security
Streamline bta_av_link_role_ok
Use canonical include paths
Add hci code conversion stack/include/hci_error_code
Remove unused bta/include/bta_api::#defs
Remove unused API BTM_GetPeerSCA
Remove unused API BTM_RequestPeerSCA
Remove unused API BTM_IsPhy2mSupported
Properly conform tACL_CONN field names
Add stack/include::BT_HDR rigid struct
Use proper types tSMP_STATUS
Properly type stack/smp::tSMP_EVT
Remove useless extern keyword for definitions
Remove unused stack/gatt/gatt_int::#defs
Re-include bta/ag/bta_ag_sdp.cc
Hansong Zhang [Mon, 8 Mar 2021 23:57:24 +0000 (23:57 +0000)]
Add a way to connect to linux raw HCI HAL am:
6453e4a8e3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1617700
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I057fa24bc1560f60ee8d6281278870a6ba5601e5
Hansong Zhang [Wed, 3 Mar 2021 23:55:37 +0000 (15:55 -0800)]
Add a way to connect to linux raw HCI HAL
Tag: #refactor
Bug:
181590011
Test: cert/run
Change-Id: I5308fd604b091392b9a8b15154732afeb03dde57
Chris Manton [Fri, 5 Mar 2021 20:25:19 +0000 (12:25 -0800)]
Introduce main_shim_test
Bug:
181991662
Test: gd/cert/run
Tag: #refactor
Change-Id: Ib81960bb3065f3964be16ba0feaf22358be8f323
Chris Manton [Fri, 5 Mar 2021 02:53:07 +0000 (18:53 -0800)]
Add main/test::shim mocks
Bug:
181991662
Test: gd/cert/run
Tag: #refactor
No-Typo-Check: Legacy misnamed code
Change-Id: I1d84f463fe1a126f1cc685b10f77f4872088a78d
Chris Manton [Fri, 5 Mar 2021 02:52:31 +0000 (18:52 -0800)]
Add gd/neighbor::inquiry mock
Bug:
181991662
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: Id475e31092c884b33bd92b4ee18ff53b7c4d4a03
Chris Manton [Fri, 5 Mar 2021 22:47:01 +0000 (14:47 -0800)]
Add SCO HACK for shim acl mock
Bug:
181991662
Test: gd/cert/run
Tag: #refactor
Change-Id: I4ba9755c6f482c99bbbc0bd55de22d45d8949815
Chris Manton [Fri, 5 Mar 2021 02:52:21 +0000 (18:52 -0800)]
Add gd/hci::controller mock
Bug:
181991662
Test: cert
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: Ib6f7b4bada0ae673842f134dc5eb22d9b2bf422d
Chris Manton [Fri, 5 Mar 2021 16:35:18 +0000 (08:35 -0800)]
gd_acl: Directly access acl manager for SCO hack
Also explicitly log SCO disconnect
Bug:
179649871
Test: gd/cert/run
Tag: #refactor
Change-Id: Ia8fb5408d909c02d01bac5057dd388e1d8909e63
Chris Manton [Wed, 3 Mar 2021 01:03:12 +0000 (17:03 -0800)]
Put stack vars in proper scope
Toward refactor-able code
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: Ied75ac91e075d9072875b34f91d91c1191473215
Chris Manton [Mon, 1 Mar 2021 18:34:01 +0000 (10:34 -0800)]
Return proper type stack/acl/btm_pm::BTM_SetPowerMode
Toward type safe code
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: Ifdd3fcbd0c149f5d5a8987f6e0a15210d8a6cdc8
Chris Manton [Mon, 1 Mar 2021 18:33:30 +0000 (10:33 -0800)]
Explicitly specify status type include/hardware/ble_scanner.h
Toward readable code
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: Ifec58b3e95fe9414b27f1199551b7cb65982ca0b
Chris Manton [Fri, 5 Mar 2021 21:51:43 +0000 (13:51 -0800)]
Add stack init indirection for activity_attribution
Conforms to peers and is more testable
Bug:
181991662
Test: cert
Tag: #refactor
Change-Id: Ib01c3b35ee5bb0deb370cbbee4d8e88929beb4dc
Chris Manton [Tue, 2 Mar 2021 21:30:20 +0000 (13:30 -0800)]
Use proper tBTM_STATUS types
Toward readable code
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I7727220d4da93279ed215fa366b528cc859b8525
Chris Manton [Mon, 1 Mar 2021 17:32:24 +0000 (09:32 -0800)]
Use tBTM_STATUS in stack/l2cap/::
Toward meaningful code
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I588780b8301474b01c2c9f52e3d9c2c1b9fdd937
Chris Manton [Thu, 4 Mar 2021 05:46:43 +0000 (21:46 -0800)]
gd_shim: Log more info about acl queue state
Bug:
179649871
Test: cert
Tag: #refactor
Change-Id: I8aaae60224afa28477d8a556ec11b11df06fa5c0
Chris Manton [Wed, 3 Mar 2021 21:46:20 +0000 (13:46 -0800)]
Add bta_sys post to main alternative method
Toward eliminating BTA sys
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: Id6b12b2d9744929ebb344fc1caf20c6a8015a525
Chris Manton [Wed, 3 Mar 2021 21:45:40 +0000 (13:45 -0800)]
Remove unused field srvc_id
Toward meaningful code
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I3dcaf1e3acacb2fe7754c24c3fd383ddce03bf69
Chris Manton [Mon, 8 Mar 2021 18:05:41 +0000 (10:05 -0800)]
Template prep for bta hardening
Syntactic sugar to wrangle next Union battle
Towards readable code
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I5921b2ab188f1062b0c1ad19bf9e2d0e2c8017db
Chris Manton [Mon, 1 Mar 2021 17:32:01 +0000 (09:32 -0800)]
Use btm_status in stack/rfcomm/::
Toward readable code
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I2e15fca337cbec3e265b7945d59a2fdbb6d178d5
Chris Manton [Wed, 3 Mar 2021 01:03:01 +0000 (17:03 -0800)]
Use proper types tBLE_SCAN_MODE
Toward readable code
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I740140779cea143d829d137d8cb8dff4748489cc
Chris Manton [Wed, 3 Mar 2021 01:02:42 +0000 (17:02 -0800)]
User proper types tBTM_STATUS
Toward readable code
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I495d4d13dfbac92b80c83223687b99763c9381a5
Chris Manton [Sun, 28 Feb 2021 07:08:57 +0000 (23:08 -0800)]
Canonicalize tBTM_APPL_INFO::bta_security
Toward readable code
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I52cb204abc1b6e42c7239c25211e87772c7c1b8d
Chris Manton [Sun, 28 Feb 2021 04:52:00 +0000 (20:52 -0800)]
Streamline bta_av_link_role_ok
Toward readable code
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: Ic559c133134392b6123a292e991ef933080cb043
Chris Manton [Thu, 4 Mar 2021 05:47:09 +0000 (21:47 -0800)]
Use canonical include paths
Toward readable code
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I5248569747177e3bb169509e34c7053145bfbfda
Chris Manton [Mon, 1 Mar 2021 21:54:35 +0000 (13:54 -0800)]
Add hci code conversion stack/include/hci_error_code
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: Ib3aadbecc039df43b6fc6bf4cc603674ecf6b4c0
Chris Manton [Wed, 3 Mar 2021 01:55:28 +0000 (17:55 -0800)]
Remove unused bta/include/bta_api::#defs
Toward meaningful code
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I46b2473c22ea1cf9f111f768d47263c19d2249ae
Chris Manton [Sun, 28 Feb 2021 04:20:44 +0000 (20:20 -0800)]
Remove unused API BTM_GetPeerSCA
Toward meaningful code
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I5050817e500d33265ecd8bfc9ec2b547ab0ff625
Chris Manton [Sun, 28 Feb 2021 04:18:04 +0000 (20:18 -0800)]
Remove unused API BTM_RequestPeerSCA
Toward meaningful code
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I2bacaee6f567d717065cab643a249072645bc0ba
Chris Manton [Sun, 28 Feb 2021 04:14:33 +0000 (20:14 -0800)]
Remove unused API BTM_IsPhy2mSupported
Toward meaningful code
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I3ea1d0538678f7617b8a485c9430ecd0e43741e9
Chris Manton [Fri, 5 Mar 2021 00:50:53 +0000 (16:50 -0800)]
Properly conform tACL_CONN field names
And put getters in header
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I544de67b543b272485e8993fc609288703c16bbf
Chris Manton [Thu, 4 Mar 2021 22:27:37 +0000 (14:27 -0800)]
Add stack/include::BT_HDR rigid struct
Missing the dreaded flexible array member which is embedded
in the middle of so many larger structs
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I7c4f92221b25dc93e6165ed7ab1991529ffc1539
Chris Manton [Tue, 2 Mar 2021 17:49:50 +0000 (09:49 -0800)]
Use proper types tSMP_STATUS
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: Ie0851299d1d4467c4beb60b73405269cf174036a
Chris Manton [Tue, 2 Mar 2021 20:32:50 +0000 (12:32 -0800)]
Properly type stack/smp::tSMP_EVT
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I9a8cc028eaf994b9b8b94d62ddaae05f4cb038e8
Chris Manton [Thu, 4 Mar 2021 05:41:15 +0000 (21:41 -0800)]
Remove useless extern keyword for definitions
Messes up my tools
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: Ic088b46d71dceadbb1ba69f4181cd2f604fb54f7
Chris Manton [Wed, 3 Mar 2021 01:11:38 +0000 (17:11 -0800)]
Remove unused stack/gatt/gatt_int::#defs
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: Ie2a465efd76aa2b594dbe0bf407176d4819aab1f
Chris Manton [Mon, 25 Jan 2021 18:04:55 +0000 (10:04 -0800)]
Re-include bta/ag/bta_ag_sdp.cc
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I3c7935841504cbc4231f339b8c47a02cfac9ed7f
weichinweng [Mon, 8 Mar 2021 09:52:28 +0000 (09:52 +0000)]
common Criteria mode: Get all bonded devices key after keystore callback init. am:
c98b5a61f5 am:
362c12d7eb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1614946
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I049a6b31411e02f0ddaec017e2c311efcc321f8c
weichinweng [Mon, 8 Mar 2021 09:52:26 +0000 (09:52 +0000)]
Common Criteria mode: Rename Common Criteria mode from NIAP mode (2/2) am:
f549b6b7b0 am:
82c8c93346
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1607907
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icf8613c96836f18ce1244da02025c78e286c5936
weichinweng [Mon, 8 Mar 2021 09:33:21 +0000 (09:33 +0000)]
common Criteria mode: Get all bonded devices key after keystore callback init. am:
c98b5a61f5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1614946
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If42c335e20adcf59db4ddeba38419a621f21fe9a
weichinweng [Mon, 8 Mar 2021 09:32:33 +0000 (09:32 +0000)]
Common Criteria mode: Rename Common Criteria mode from NIAP mode (2/2) am:
f549b6b7b0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1607907
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I88a5a5046e53210bad32d4c259f1e9de59dfe3b7
weichinweng [Thu, 4 Mar 2021 02:39:56 +0000 (10:39 +0800)]
common Criteria mode: Get all bonded devices key after keystore callback init.
Bug:
181293964
Test: atest BluetoothInstrumentationTests
Tag: #feature
Change-Id: I25c70363d7651c27a6c15b60db9402eee359d804
weichinweng [Thu, 4 Mar 2021 01:11:30 +0000 (09:11 +0800)]
Common Criteria mode: Rename Common Criteria mode from NIAP mode (2/2)
Bug:
181293964
Test: atest BluetoothInstrumentationTests
Tag: #feature
Change-Id: I8455403fdfad2451831c6b5d3f9162b7e3a0296d
Chris Manton [Sat, 6 Mar 2021 04:17:09 +0000 (04:17 +0000)]
Re-include stack/hid/hidd_conn.cc am:
e17a9c84ce am:
78a728851c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1574481
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7cf3ca0fef087b3d610df093c6fcb909f4e7fde5
Chris Manton [Sat, 6 Mar 2021 03:39:52 +0000 (03:39 +0000)]
Re-include stack/hid/hidd_conn.cc am:
e17a9c84ce
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1574481
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9e39431471a3360c4abf5cdabe1471266931fd94
Myles Watson [Sat, 6 Mar 2021 00:08:31 +0000 (00:08 +0000)]
[automerger skipped] smp: Reject pairing if the public keys match am:
8106ba3798 -s ours am:
75314b8d92 -s ours am:
4d251c8338 -s ours am:
01b3bccf19 -s ours am:
b2d9ae3640 -s ours am:
c1a950be8e -s ours
am skip reason: Change-Id I0902fdf6bb5c1c7d443fc73fc480d51226fb836b with SHA-1
b7e176df4b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13522370
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I50f38c56a2cd7cb9979d6e580bcc63b6442bf979
Myles Watson [Fri, 5 Mar 2021 23:30:36 +0000 (23:30 +0000)]
[automerger skipped] smp: Reject pairing if the public keys match am:
8106ba3798 -s ours am:
75314b8d92 -s ours am:
4d251c8338 -s ours am:
01b3bccf19 -s ours am:
b2d9ae3640 -s ours
am skip reason: Change-Id I0902fdf6bb5c1c7d443fc73fc480d51226fb836b with SHA-1
b7e176df4b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13522370
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1b56da3b720063ba8ccdc7cf289f476093801396
Myles Watson [Fri, 5 Mar 2021 22:50:24 +0000 (22:50 +0000)]
[automerger skipped] smp: Reject pairing if the public keys match am:
8106ba3798 -s ours am:
75314b8d92 -s ours am:
4d251c8338 -s ours am:
01b3bccf19 -s ours
am skip reason: Change-Id I0902fdf6bb5c1c7d443fc73fc480d51226fb836b with SHA-1
b7e176df4b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13522370
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I69ea6b555c84d0a1bb23acb043dfdb419c643d5e
Myles Watson [Fri, 5 Mar 2021 22:31:28 +0000 (22:31 +0000)]
[automerger skipped] smp: Reject pairing if the public keys match am:
8106ba3798 -s ours am:
75314b8d92 -s ours am:
4d251c8338 -s ours
am skip reason: Change-Id I0902fdf6bb5c1c7d443fc73fc480d51226fb836b with SHA-1
b7e176df4b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13522370
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1e17396812c90f45bd3fcf2170656928d552aef1
Chris Manton [Sat, 23 Jan 2021 19:20:08 +0000 (11:20 -0800)]
Re-include stack/hid/hidd_conn.cc
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: Idd4aa5471bc96a8df01adf2507e8d6bafed37a4c
Myles Watson [Fri, 5 Mar 2021 21:56:15 +0000 (21:56 +0000)]
[automerger skipped] smp: Reject pairing if the public keys match am:
8106ba3798 -s ours am:
75314b8d92 -s ours
am skip reason: Change-Id I0902fdf6bb5c1c7d443fc73fc480d51226fb836b with SHA-1
b7e176df4b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13522370
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idb25a8fc4e94ac3ec87a6fdf398fb311b53d1cdd
Myles Watson [Fri, 5 Mar 2021 21:14:14 +0000 (21:14 +0000)]
[automerger skipped] smp: Reject pairing if the public keys match am:
8106ba3798 -s ours
am skip reason: Change-Id I0902fdf6bb5c1c7d443fc73fc480d51226fb836b with SHA-1
b7e176df4b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13522370
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3d8d7fe30e1b5a805c4717f7c136562eb14f4b72
Greg Kaiser [Fri, 5 Mar 2021 19:39:34 +0000 (19:39 +0000)]
Avoid potential null dereference am:
e162661987 am:
fe5a828063
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1621319
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia9b7b7cb3c02f4068102df953fc25f594ef0f1d1
Greg Kaiser [Fri, 5 Mar 2021 18:46:07 +0000 (18:46 +0000)]
Avoid potential null dereference am:
e162661987
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1621319
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6f720d000ad81820fa56f99f266edd1f957bc32e
Myles Watson [Mon, 8 Feb 2021 22:38:57 +0000 (14:38 -0800)]
smp: Reject pairing if the public keys match
Bug:
174886838
Test: pair an LE device
Tag: #security
Change-Id: I0902fdf6bb5c1c7d443fc73fc480d51226fb836b
Merged-In: I0902fdf6bb5c1c7d443fc73fc480d51226fb836b
Jeongik Cha [Fri, 5 Mar 2021 16:40:29 +0000 (16:40 +0000)]
Merge "Turn off sanitize options for root-canal for linux_bionic" am:
acee176985 am:
109470bcb2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1607902
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3587ccde8fb4a6c74f38a972d0bf7d7a38ecc2a6
Greg Kaiser [Fri, 5 Mar 2021 16:04:46 +0000 (08:04 -0800)]
Avoid potential null dereference
We move our null check of 'p_dev' to before the first time we
dereference it.
Tag: #stability
Bug:
179741365
Test: TreeHuggger
Change-Id: Iafc45c9f82b88f9f0462f87b029789e861509287
Jeongik Cha [Fri, 5 Mar 2021 16:02:43 +0000 (16:02 +0000)]
Merge "Turn off sanitize options for root-canal for linux_bionic" am:
acee176985
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1607902
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I64dabf32a05d7dfc183bf2ed91090ee5ad1b6a60
Jeongik Cha [Fri, 5 Mar 2021 15:29:21 +0000 (15:29 +0000)]
Merge "Turn off sanitize options for root-canal for linux_bionic"
HsingYuan Lo [Fri, 5 Mar 2021 15:22:38 +0000 (15:22 +0000)]
Use cid instead of attribute handle am:
0ea8f91ef5 am:
7618338f50
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1612960
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I499b00c9580ec5ffc1f84d0d9c412683d7a1e73a
HsingYuan Lo [Fri, 5 Mar 2021 14:44:34 +0000 (14:44 +0000)]
Use cid instead of attribute handle am:
0ea8f91ef5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1612960
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I98a3e643bc1abc7e3c37b6f2663359e58c1dc0c6
HsingYuan Lo [Tue, 2 Mar 2021 09:52:40 +0000 (17:52 +0800)]
Use cid instead of attribute handle
Current API is defined as below
void BTA_GATTC_SendIndConfirm(uint16_t conn_id, uint16_t cid)
We need to use cid instead of attribute handle, otherwise when eatt is
enabled, something will happen
Bug:
159786353
Test: compile & make sure the cid is correctly sent to stack
Tag: #feature
Change-Id: If0cd9dd6783af7fefdb7af7130e5e9545188eecd
TreeHugger Robot [Fri, 5 Mar 2021 09:56:19 +0000 (09:56 +0000)]
[automerger skipped] Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into pi-dev am:
683f95562b -s ours am:
63e5f9a0ef am:
c3a5b5b006 -s ours am:
6696abc0b6 am:
cf95007900
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13422723
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib919c13f979830f6f4d7bec03c6a28bb289f64d4
TreeHugger Robot [Fri, 5 Mar 2021 09:56:09 +0000 (09:56 +0000)]
[automerger skipped] Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into qt-dev am:
8a6fe7c3d9 am:
bc5632c80f -s ours am:
19c5352594 am:
27025ab031
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2abea4a4f02c22532f7a866aa7e2ef5b063f9613
Chienyuan [Fri, 5 Mar 2021 09:56:07 +0000 (09:56 +0000)]
[automerger skipped] DO NOT MERGE Add mutex for std::map in btif_av.cc am:
f230ef243e am:
df8b0e90b0 -s ours am:
324b8b0bd9 am:
4099b523c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibd30cd2f1d406ab05e3030861209f52b0fb61355
TreeHugger Robot [Fri, 5 Mar 2021 09:55:43 +0000 (09:55 +0000)]
Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into rvc-dev am:
43c129c9be am:
61ca2fc466
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425807
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I274e711f3fc1bd75656e10d87012053cd6dd6172
Chienyuan [Fri, 5 Mar 2021 09:55:40 +0000 (09:55 +0000)]
[automerger skipped] DO NOT MERGE Add mutex for std::map in btif_av.cc am:
1be5b0d940 am:
85ca25d8a6 -s ours
am skip reason: skipped by user chienyuanhuang
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425807
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icc06c220838ab0c16fd9bd7b0d26bc70585381c1
Jakub Pawlowski [Fri, 5 Mar 2021 08:41:18 +0000 (08:41 +0000)]
Cert test scaffolding for iso layer am:
4a9e935ee9 am:
fe04673974
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1554494
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f6c02d1314810c7aa0cf45680376ae677e0fb00
Jakub Tyszkowski [Fri, 5 Mar 2021 08:40:57 +0000 (08:40 +0000)]
stack/test: Fix memory leak in iso tests am:
15450a8f62 am:
2666b35e85
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1613123
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7ff0e198126826f972da52ad48221c9ee6cceb89
Jakub Pawlowski [Fri, 5 Mar 2021 08:22:59 +0000 (08:22 +0000)]
Cert test scaffolding for iso layer am:
4a9e935ee9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1554494
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I308089023917e3ee4a348816927e4ca932d2c7b3
Jakub Tyszkowski [Fri, 5 Mar 2021 08:21:50 +0000 (08:21 +0000)]
stack/test: Fix memory leak in iso tests am:
15450a8f62
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1613123
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7fc37bcae6f7531be5dfa005701b4874f865701f
TreeHugger Robot [Fri, 5 Mar 2021 08:21:47 +0000 (08:21 +0000)]
[automerger skipped] Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into pi-dev am:
683f95562b -s ours am:
63e5f9a0ef am:
c3a5b5b006 -s ours am:
6696abc0b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13422723
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idb049d03151ef443699e7761a9a55afe63fc7915
TreeHugger Robot [Fri, 5 Mar 2021 08:03:19 +0000 (08:03 +0000)]
[automerger skipped] Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into qt-dev am:
8a6fe7c3d9 am:
bc5632c80f -s ours am:
19c5352594
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic9b04e25a018690dd7087aaf0d4ce05e5b66a2f4
TreeHugger Robot [Fri, 5 Mar 2021 08:03:17 +0000 (08:03 +0000)]
[automerger skipped] Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into pi-dev am:
683f95562b -s ours am:
63e5f9a0ef am:
c3a5b5b006 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13422723
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I91475cfec74d34a5ae7b4db71cb0ef21cbc673d3
Chienyuan [Fri, 5 Mar 2021 08:03:17 +0000 (08:03 +0000)]
[automerger skipped] DO NOT MERGE Add mutex for std::map in btif_av.cc am:
f230ef243e am:
df8b0e90b0 -s ours am:
324b8b0bd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9fdd5cc83a684bddfe72c9f72b8b2a968f98b173
Jakub Pawlowski [Tue, 23 Feb 2021 08:19:43 +0000 (09:19 +0100)]
Cert test scaffolding for iso layer
Tag: #feature
Test: cert/run LeIsoTest
Bug:
177907117
Change-Id: Icc23db17d5f6fc8d0fd1f9497a64c99d9f0cfd5e
TreeHugger Robot [Fri, 5 Mar 2021 07:44:53 +0000 (07:44 +0000)]
[automerger skipped] Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into pi-dev am:
683f95562b -s ours am:
63e5f9a0ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13422723
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5729d1ef17f6f2d55395e4518224d7ff131759a5
TreeHugger Robot [Fri, 5 Mar 2021 07:44:49 +0000 (07:44 +0000)]
[automerger skipped] Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into qt-dev am:
8a6fe7c3d9 am:
bc5632c80f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iec00c49e1b6f6951cb3022ef6f7eeb6b6343bd71
Chienyuan [Fri, 5 Mar 2021 07:44:46 +0000 (07:44 +0000)]
[automerger skipped] DO NOT MERGE Add mutex for std::map in btif_av.cc am:
f230ef243e am:
df8b0e90b0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I425dddcb2f89486ff43c2c2d9e3badf2948e0408
Jakub Tyszkowski [Tue, 2 Mar 2021 15:01:59 +0000 (15:01 +0000)]
stack/test: Fix memory leak in iso tests
HCI command buffer should be released after
passing it to the mock bte interface.
Bug:
150670922
Tag: #feature
Test: atest net_test_btm_iso
Sponsor: jpawlowski@
Change-Id: I2b1f09614357effeeca09a232f27932e24f00a1b
TreeHugger Robot [Fri, 5 Mar 2021 07:27:29 +0000 (07:27 +0000)]
[automerger skipped] Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into pi-dev am:
683f95562b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13422723
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad562f0bc9e68b3adc0fc6a4ee6a89bc35f66648
TreeHugger Robot [Fri, 5 Mar 2021 07:23:15 +0000 (07:23 +0000)]
[automerger skipped] Merge "DO NOT MERGE : Re-land: SMP: Validate remote elliptic curve points" into oc-mr1-dev am:
cfc256e14d -s ours am:
ec2cdfc472 -s ours am:
b778451782 am:
7c13c57728 -s ours am:
43b7303bd3 am:
a9d0d2a77a
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13756432
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7fc16a9e4136d49fd1079f6fccd6175ea766ebda
TreeHugger Robot [Fri, 5 Mar 2021 07:23:04 +0000 (07:23 +0000)]
Merge "avrcp: Ignore AVCT commands that are too long" into oc-mr1-dev am:
c89971ccbb am:
c1282f371b am:
fc6a2327ac am:
b01c117452 am:
ac3fb23588 am:
a083e78dac
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13490135
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie453c02dc58e3e4bd40de456f7f3bd8f7b36d998
TreeHugger Robot [Fri, 5 Mar 2021 07:23:03 +0000 (07:23 +0000)]
Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into qt-dev am:
8a6fe7c3d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0fb525ed5e51224ae7229721d1f75c2c1d58a0c4
Chienyuan [Fri, 5 Mar 2021 07:23:01 +0000 (07:23 +0000)]
DO NOT MERGE Add mutex for std::map in btif_av.cc am:
f230ef243e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia2216b584ad62cf1b0ece43dbc113e68c5f717c3
TreeHugger Robot [Fri, 5 Mar 2021 07:02:17 +0000 (07:02 +0000)]
Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into rvc-dev am:
43c129c9be
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425807
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3411fa2421a456dfd3f808dc22cc3e41d9fe26f0
Chienyuan [Fri, 5 Mar 2021 07:02:15 +0000 (07:02 +0000)]
DO NOT MERGE Add mutex for std::map in btif_av.cc am:
1be5b0d940
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425807
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iffe6cc016fc6a8693ee0f0a5cd1a28eecc47bfd7
TreeHugger Robot [Fri, 5 Mar 2021 07:02:05 +0000 (07:02 +0000)]
[automerger skipped] Merge "DO NOT MERGE : Re-land: SMP: Validate remote elliptic curve points" into oc-mr1-dev am:
cfc256e14d -s ours am:
ec2cdfc472 -s ours am:
b778451782 am:
7c13c57728 -s ours am:
43b7303bd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13756432
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie2051f2ac893109647525d6b3234a6353c22fbc7
TreeHugger Robot [Fri, 5 Mar 2021 07:01:51 +0000 (07:01 +0000)]
Merge "avrcp: Ignore AVCT commands that are too long" into oc-mr1-dev am:
c89971ccbb am:
c1282f371b am:
fc6a2327ac am:
b01c117452 am:
ac3fb23588
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13490135
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaf3d72072ae0fb93a1932b8cffdfd93ee10eb6ce
TreeHugger Robot [Fri, 5 Mar 2021 06:58:41 +0000 (06:58 +0000)]
Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into pi-dev
TreeHugger Robot [Fri, 5 Mar 2021 06:54:19 +0000 (06:54 +0000)]
Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into rvc-dev
TreeHugger Robot [Fri, 5 Mar 2021 06:54:01 +0000 (06:54 +0000)]
Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into qt-dev
Treehugger Robot [Fri, 5 Mar 2021 06:20:29 +0000 (06:20 +0000)]
Merge "Bluetooth hal metrics: Add LogBluetoothHalCrashReason" am:
2ad2fc4b2a am:
40568c2099
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1597873
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If4d62b1e4526a130189083966c23a5d1ac49e8c8
Sal Savage [Fri, 5 Mar 2021 06:19:37 +0000 (06:19 +0000)]
Merge "Exit notification timeouts immediately for disconnected devices" am:
f0f8c689b5 am:
41a47c0bf0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1609997
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic58e6a8917dd6442d1fdb6a4d1b639926f340525
Hansong Zhang [Fri, 5 Mar 2021 06:19:07 +0000 (06:19 +0000)]
Some dependencies are host supported am:
70f01015e1 am:
af2be5795e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1613820
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I61826c75430c920dc280bd5baaa554163a14e636
Hansong Zhang [Fri, 5 Mar 2021 06:19:05 +0000 (06:19 +0000)]
Add host support for libbluetooth.so am:
75847f0c0b am:
d7e847385f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1612800
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib1c9e9fe329aadfc3a6baaf3252039f60903571b
Chienyuan [Fri, 5 Mar 2021 06:18:46 +0000 (06:18 +0000)]
gd: Fix address manager bug am:
2e0e8680a0 am:
4cbf4cdfd1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1614948
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9c0f20e7c382a0d13d61616b6d4719b7aea3d03a
OSDN Git Service
