OSDN Git Service
Abhishek Pandit-Subedi [Tue, 4 May 2021 03:04:10 +0000 (03:04 +0000)]
Merge "Fix btaa activity attribution for Linux build" am:
be4e9d5934 am:
0e0d8ac30e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1694885
Change-Id: Ibcf1853d94a3db8085ae05e24a33626fdf626742
Abhishek Pandit-Subedi [Tue, 4 May 2021 02:49:02 +0000 (02:49 +0000)]
Merge "Fix btaa activity attribution for Linux build" am:
be4e9d5934
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1694885
Change-Id: Iea64e3e6f5e5e0e2ccb7e9b41bc98a6c98158896
Abhishek Pandit-Subedi [Tue, 4 May 2021 01:56:08 +0000 (01:56 +0000)]
Merge "Fix btaa activity attribution for Linux build"
Treehugger Robot [Tue, 4 May 2021 01:01:32 +0000 (01:01 +0000)]
Merge changes I35fefd23,Idaa677cb,If3a263d4 am:
78e895ba4d am:
5246f82b64
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692858
Change-Id: Icdac8bb9b364d344d869d59a425e3468de37bdad
Treehugger Robot [Tue, 4 May 2021 00:34:05 +0000 (00:34 +0000)]
Merge changes I35fefd23,Idaa677cb,If3a263d4 am:
78e895ba4d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692858
Change-Id: Ie1d31cce815ef0a316e4b79afd0c49b69bbf0bf3
Treehugger Robot [Tue, 4 May 2021 00:15:42 +0000 (00:15 +0000)]
Merge changes I35fefd23,Idaa677cb,If3a263d4
* changes:
Introduce stack_btu_test
Remove bta/hh/bta_hh_le::BTA_HH_DEBUG
Remove execute bit for source file bta/hh/bta_hh_le
Abhishek Pandit-Subedi [Mon, 3 May 2021 22:56:03 +0000 (22:56 +0000)]
Fix btaa activity attribution for Linux build
Missing entries in BUILD.gn and Linux stubs for dumpsys.
Bug:
187109138
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: I9d72a29d56d0461375cc9235894a384dae183fd6
Treehugger Robot [Mon, 3 May 2021 22:15:02 +0000 (22:15 +0000)]
Merge "Replace base::MessageLoopCurrent* by base::Current*Thread" am:
4a5ae7d60e am:
22e232691b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1694386
Change-Id: Ifb328d556c67fd1d6dee1cfc49c8259efd303e8d
Treehugger Robot [Mon, 3 May 2021 21:51:08 +0000 (21:51 +0000)]
Merge "Replace base::MessageLoopCurrent* by base::Current*Thread" am:
4a5ae7d60e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1694386
Change-Id: I79b0f05a4e89df9e098f0fdc0348ba69293edd17
Treehugger Robot [Mon, 3 May 2021 21:35:53 +0000 (21:35 +0000)]
Merge "Replace base::MessageLoopCurrent* by base::Current*Thread"
Sal Savage [Mon, 3 May 2021 21:13:18 +0000 (21:13 +0000)]
Merge "Handle connection failures on the control channel properly" am:
8c65349370 am:
a5cb92e7c9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692649
Change-Id: I67f77802d007b6038b6245615b7a347456324b41
Sonny Sasaka [Mon, 3 May 2021 21:13:12 +0000 (21:13 +0000)]
Merge "Add script to generate libchrome R91 version" am:
37d2b47789 am:
30aec5a0e1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692492
Change-Id: I7c5302257eb40a0fdd73434a7f4e121a16532203
Sal Savage [Mon, 3 May 2021 20:49:32 +0000 (20:49 +0000)]
Merge "Handle connection failures on the control channel properly" am:
8c65349370
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692649
Change-Id: I240d1837118c778edbe825c019cedd7ae30bcdb6
Sonny Sasaka [Mon, 3 May 2021 20:48:33 +0000 (20:48 +0000)]
Merge "Add script to generate libchrome R91 version" am:
37d2b47789
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692492
Change-Id: Ib53269f3bd52162fff817c4cdaf210f6d7d814da
Sal Savage [Mon, 3 May 2021 20:40:03 +0000 (20:40 +0000)]
Merge "Handle connection failures on the control channel properly"
Sonny Sasaka [Mon, 3 May 2021 20:11:38 +0000 (20:11 +0000)]
Merge "Add script to generate libchrome R91 version"
Abhishek Pandit-Subedi [Mon, 3 May 2021 19:56:20 +0000 (12:56 -0700)]
Replace base::MessageLoopCurrent* by base::Current*Thread
Make changes necessary for recent uprev of libchrome to r822064.
Bug:
187086497
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: I63f954c1ce5e0bf455e1da1e258d4a8b88fcfc9d
Treehugger Robot [Mon, 3 May 2021 18:17:54 +0000 (18:17 +0000)]
Merge "OOB: Generate random for LE" am:
2d2e4a7603 am:
a90ff5062b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690127
Change-Id: I73338a3dee1f56210fca516841dab27680dd8400
Treehugger Robot [Mon, 3 May 2021 18:02:18 +0000 (18:02 +0000)]
Merge "OOB: Generate random for LE" am:
2d2e4a7603
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690127
Change-Id: Iac71010f1b4c621240cbb262a00e01606d65b618
Treehugger Robot [Mon, 3 May 2021 17:40:25 +0000 (17:40 +0000)]
Merge "OOB: Generate random for LE"
Chris Manton [Mon, 3 May 2021 04:12:54 +0000 (04:12 +0000)]
Unnecessary def BTA_GATTC_CONN_MAX => GATT_MAX_PHY_CHANNEL am:
f50690c3fc am:
147e0865f6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692857
Change-Id: I452e6c173da4c2c205f706a238100280f2099409
Chris Manton [Mon, 3 May 2021 04:12:53 +0000 (04:12 +0000)]
Re-point bta:: tests to common test/mock am:
2dbbbca5f1 am:
793a6f4e2e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692799
Change-Id: Ifc47023c0d2b40688722c83ab4b7fef9e8897b32
Chris Manton [Mon, 3 May 2021 04:12:52 +0000 (04:12 +0000)]
Const-ify the bta/hh/bta_hh::API data types am:
ee6b8adcd1 am:
df48c8caf4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692798
Change-Id: Iac38df0ef5fb8946474fd9c4ce15282585d91cae
Chris Manton [Mon, 3 May 2021 04:12:51 +0000 (04:12 +0000)]
Remove unused member tHID_HOST_DEV_CTB::conn_substate am:
a67b1f54c9 am:
cf27c01f85
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692797
Change-Id: Ieef1bf00c8aa8a173d4a5cb433b3b9c8e3a4bd44
Chris Manton [Mon, 3 May 2021 04:12:50 +0000 (04:12 +0000)]
Move stack/l2cap::text from compilation unit into header am:
3fbc096f45 am:
d711032263
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692794
Change-Id: If101def24c41186f700992b168ed9d5f6f1b8527
Chris Manton [Mon, 3 May 2021 04:12:49 +0000 (04:12 +0000)]
Add BTA_ID_HH for logging am:
568b92ff38 am:
6e6cdb942b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692793
Change-Id: I8a33851695c2945cc04e9f4de2603e1f5067f6c9
Chris Manton [Mon, 3 May 2021 04:12:48 +0000 (04:12 +0000)]
Add include/hardware/bt_hh::bthh_connection_state_text am:
df8fbbf2b6 am:
e7d8d3d11d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692792
Change-Id: I3cbc293c6d44021674e4891519f02c53b090401c
Chris Manton [Mon, 3 May 2021 04:12:47 +0000 (04:12 +0000)]
Remove unused declaration am:
f260dc6e96 am:
ed8f21eb6e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692791
Change-Id: I918ddbf60a5d218bfd6e92ffaa3db969fbe46da5
Chris Manton [Mon, 3 May 2021 04:12:46 +0000 (04:12 +0000)]
btm_log: Streamline hid logging am:
f7dd3dd0bf am:
19c19a4670
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692790
Change-Id: Ib16fe986791317af8cb52676e9faf793d9e47603
Chris Manton [Mon, 3 May 2021 04:12:44 +0000 (04:12 +0000)]
log: Swap proper initiator am:
0973f8d157 am:
8561ca0747
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692789
Change-Id: Ib8f403e2176e36e75ed55aac99ca83ebccef37e6
Chris Manton [Mon, 3 May 2021 03:59:10 +0000 (03:59 +0000)]
Unnecessary def BTA_GATTC_CONN_MAX => GATT_MAX_PHY_CHANNEL am:
f50690c3fc
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692857
Change-Id: I124383b300bee22a80d9f887c0c6fcdc4af0be81
Chris Manton [Mon, 3 May 2021 03:59:07 +0000 (03:59 +0000)]
Re-point bta:: tests to common test/mock am:
2dbbbca5f1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692799
Change-Id: Id82d3791a88c7fa2017e5775631137bfa215e02a
Chris Manton [Mon, 3 May 2021 03:59:04 +0000 (03:59 +0000)]
Const-ify the bta/hh/bta_hh::API data types am:
ee6b8adcd1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692798
Change-Id: I2e5641f84bfba2dfc6808ffdece1965a167a645b
Chris Manton [Mon, 3 May 2021 03:59:02 +0000 (03:59 +0000)]
Remove unused member tHID_HOST_DEV_CTB::conn_substate am:
a67b1f54c9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692797
Change-Id: I5b4a6a19da4fa75a4491d83c7f7d9f9c3510f0e6
Chris Manton [Mon, 3 May 2021 03:58:59 +0000 (03:58 +0000)]
Move stack/l2cap::text from compilation unit into header am:
3fbc096f45
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692794
Change-Id: I62e859e7f63a1e7dae963ba97e25bf0c05a53607
Chris Manton [Mon, 3 May 2021 03:58:57 +0000 (03:58 +0000)]
Add BTA_ID_HH for logging am:
568b92ff38
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692793
Change-Id: I814d0939fccd25f11c25f0e794c88c6258f28660
Chris Manton [Mon, 3 May 2021 03:58:55 +0000 (03:58 +0000)]
Add include/hardware/bt_hh::bthh_connection_state_text am:
df8fbbf2b6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692792
Change-Id: Icd5f41ee2e0b42dc7ca60d47a03bf698fc48988f
Chris Manton [Mon, 3 May 2021 03:58:52 +0000 (03:58 +0000)]
Remove unused declaration am:
f260dc6e96
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692791
Change-Id: I2b8eacbd64e9ac64dfeb812ddd2efe92696a31e2
Chris Manton [Mon, 3 May 2021 03:58:50 +0000 (03:58 +0000)]
btm_log: Streamline hid logging am:
f7dd3dd0bf
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692790
Change-Id: If4e8e7ba18e6a67779b5f80d877ac9420792a967
Chris Manton [Mon, 3 May 2021 03:58:03 +0000 (03:58 +0000)]
log: Swap proper initiator am:
0973f8d157
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692789
Change-Id: Icb78817b012519b7151a8374b1d66da6f5b4df75
Chris Manton [Sat, 1 May 2021 16:26:56 +0000 (09:26 -0700)]
Introduce stack_btu_test
Towards testable code
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
No-Typo-Check: Legacy code mocks
Change-Id: I35fefd23efe47af881ae22765157c7e723973c10
Chris Manton [Sat, 1 May 2021 06:16:19 +0000 (23:16 -0700)]
Unnecessary def BTA_GATTC_CONN_MAX => GATT_MAX_PHY_CHANNEL
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I034765099d25b207e8085fcdae59de866d400278
Chris Manton [Fri, 30 Apr 2021 22:21:38 +0000 (15:21 -0700)]
Re-point bta:: tests to common test/mock
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I8dbfc4754a754011a0c06c5f8d21abce15931cd3
Chris Manton [Wed, 17 Mar 2021 01:46:17 +0000 (18:46 -0700)]
Const-ify the bta/hh/bta_hh::API data types
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I37c61447dc921ce10e112a30bdb8dc011dff3410
Chris Manton [Mon, 15 Mar 2021 17:23:17 +0000 (10:23 -0700)]
Remove unused member tHID_HOST_DEV_CTB::conn_substate
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I7fcfc640ef7728ae924e55d3ce1f4fa43b09963a
Chris Manton [Fri, 30 Apr 2021 06:20:36 +0000 (23:20 -0700)]
Move stack/l2cap::text from compilation unit into header
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I7b14bb2a83444d0147dd1f02f39881f8990998d7
Chris Manton [Thu, 29 Apr 2021 20:44:11 +0000 (13:44 -0700)]
Add BTA_ID_HH for logging
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: Ib3798e340688cc400f96b743afc15f46e365022a
Chris Manton [Thu, 29 Apr 2021 20:43:55 +0000 (13:43 -0700)]
Add include/hardware/bt_hh::bthh_connection_state_text
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I9050d99e913c96454837f95a266efcf828bcf6b4
Chris Manton [Thu, 29 Apr 2021 05:23:22 +0000 (22:23 -0700)]
Remove unused declaration
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I5c6a76d903e56fe4ec721ec0701e305e8bd1b13d
Chris Manton [Thu, 29 Apr 2021 05:22:49 +0000 (22:22 -0700)]
btm_log: Streamline hid logging
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
No-Typo-Check: Legacy code mocks
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: If3f967ddabe64c481536debd44a31b989eff1565
Chris Manton [Thu, 29 Apr 2021 00:51:59 +0000 (17:51 -0700)]
log: Swap proper initiator
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I9ade378b5de1677d6be9d7e56af8589ff023e613
Chris Manton [Fri, 30 Apr 2021 17:31:46 +0000 (10:31 -0700)]
Remove bta/hh/bta_hh_le::BTA_HH_DEBUG
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: Idaa677cb4eeb8342246adbd72e4980fa1242fea0
Chris Manton [Fri, 30 Apr 2021 17:29:44 +0000 (10:29 -0700)]
Remove execute bit for source file bta/hh/bta_hh_le
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: If3a263d4a61939af0a00e5495207138a82a0e5b6
Treehugger Robot [Sat, 1 May 2021 20:53:26 +0000 (20:53 +0000)]
Merge "ScanningManagerTest: Wait for the Filter command" am:
81ce4d3e70 am:
c6c847e0ca
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692906
Change-Id: I6f3b851850b352b4c332dff396307271f467c507
Myles Watson [Sat, 1 May 2021 20:53:20 +0000 (20:53 +0000)]
GD: Split tests into module vs unit tests am:
479f99dcab am:
7dc3cfa2e7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692905
Change-Id: I47f047c2fae5c3467a528b718e36b641364acc49
Treehugger Robot [Sat, 1 May 2021 20:35:02 +0000 (20:35 +0000)]
Merge "ScanningManagerTest: Wait for the Filter command" am:
81ce4d3e70
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692906
Change-Id: Id0347af4b3465bce562c48549f0aca31608211c4
Myles Watson [Sat, 1 May 2021 20:34:55 +0000 (20:34 +0000)]
GD: Split tests into module vs unit tests am:
479f99dcab
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692905
Change-Id: I2e600abbaaec0e6acd7d82d2abea062d6b804962
Treehugger Robot [Sat, 1 May 2021 20:21:47 +0000 (20:21 +0000)]
Merge "ScanningManagerTest: Wait for the Filter command"
Myles Watson [Fri, 30 Apr 2021 23:45:51 +0000 (16:45 -0700)]
ScanningManagerTest: Wait for the Filter command
Bug:
176832968
Test: atest bluetooth_test_gd
Tag: #gd-refactor
Change-Id: Idf36458a196e1ad3278f3eb8a2d384586ac40afe
Myles Watson [Sat, 1 May 2021 14:15:40 +0000 (07:15 -0700)]
GD: Split tests into module vs unit tests
Move simpler, single-threaded tests into their own set of unit tests.
Bug:
176832968
Test: atest bluetooth_test_gd_unit
Tag: #gd-refactor
Change-Id: Ic3fa06454d119764aa547f975843583c00c32fc4
Martin Brabham [Tue, 27 Apr 2021 04:35:22 +0000 (21:35 -0700)]
OOB: Generate random for LE
Bug:
184377951
Test: Compiles, test app.
Tag: #feature
Change-Id: I92c1fa84383f2a30fbea1f858417393aefe1d302
Sonny Sasaka [Sat, 1 May 2021 00:58:26 +0000 (17:58 -0700)]
Add script to generate libchrome R91 version
Bug:
179821440
Tag: #floss
Test: None
Change-Id: I9114fb825a88b69fb8017943ed24a9cf169c9a09
Erwin Jansen [Sat, 1 May 2021 01:01:06 +0000 (01:01 +0000)]
Enable missing HCI cmds in rootcanal am:
1d73e8ba2d am:
e58c9943ff
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692659
Change-Id: Id69b363f8eb703899e57acedb3b267bf97aca244
Erwin Jansen [Sat, 1 May 2021 00:45:12 +0000 (00:45 +0000)]
Enable missing HCI cmds in rootcanal am:
1d73e8ba2d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692659
Change-Id: I306349ec2b6d0f627bd5f0ed951ecc62b0fa54b6
Treehugger Robot [Fri, 30 Apr 2021 22:53:25 +0000 (22:53 +0000)]
Merge "ACL: Delay early RoleChange until after a ConnectionComplete" am:
caa93c7426 am:
4daf80a5b9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1688961
Change-Id: Ibac55ce74f69ea4546d25f526630e795329aa290
Erwin Jansen [Fri, 30 Apr 2021 22:31:21 +0000 (15:31 -0700)]
Enable missing HCI cmds in rootcanal
This enables:
- 7.8.44 LE Set Address Resolution Enable command
- 7.8.45 LE Set Resolvable Private Address Timeout
Both are NOPs for now.
Bug:
186861350
Bug:
186541528
Test: NimBLE gets a bit further with root canal
Change-Id: I3d1b95a30afc97d1f1f7555ac891b4f4df872eec
Treehugger Robot [Fri, 30 Apr 2021 22:32:15 +0000 (22:32 +0000)]
Merge "ACL: Delay early RoleChange until after a ConnectionComplete" am:
caa93c7426
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1688961
Change-Id: I8df0ab31dd66155f96c75f43516e72867e8da3e8
Treehugger Robot [Fri, 30 Apr 2021 22:12:41 +0000 (22:12 +0000)]
Merge "ACL: Delay early RoleChange until after a ConnectionComplete"
Erwin Jansen [Fri, 30 Apr 2021 22:06:04 +0000 (22:06 +0000)]
Merge "Compilation fixes for MSVC" am:
4e04984bb3 am:
5e9105e82b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1688811
Change-Id: I02237afcc46bf479c2cd3ab349941ae6b8851adb
Erwin Jansen [Fri, 30 Apr 2021 21:51:03 +0000 (21:51 +0000)]
Merge "Compilation fixes for MSVC" am:
4e04984bb3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1688811
Change-Id: I16d3dfc14d73d7615d0b432b9b1ffe9ec80db885
Treehugger Robot [Fri, 30 Apr 2021 21:43:10 +0000 (21:43 +0000)]
Merge changes I02cc2057,Icb879814,I468ac585,Idf93afcf,If3006967, ... am:
f54f80ed1e am:
a6efacd756
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1680525
Change-Id: I26348633e74d6db045dd66692aa46c81e68d9faa
Erwin Jansen [Fri, 30 Apr 2021 21:35:37 +0000 (21:35 +0000)]
Merge "Compilation fixes for MSVC"
Treehugger Robot [Fri, 30 Apr 2021 21:27:51 +0000 (21:27 +0000)]
Merge changes I02cc2057,Icb879814,I468ac585,Idf93afcf,If3006967, ... am:
f54f80ed1e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1680525
Change-Id: I5152f26613970ca1c173fbdca266d703a18ba4e1
Treehugger Robot [Fri, 30 Apr 2021 21:00:13 +0000 (21:00 +0000)]
Merge changes I02cc2057,Icb879814,I468ac585,Idf93afcf,If3006967, ...
* changes:
btaa: Add device-activity aggregation dumpsys data
btaa: HCI ACL/SCO/ISO data packets process
btaa: gd: Add wakeup reason dumpsys data
btaa: attribute wakeup and wakelock duration over processed HCI buckets
btaa: HCI LE and special event process
btaa: HCI classic event process
btaa: HCI command process
btaa: handle wakelock notification
btaa: handle wakeup notification
Sal Savage [Fri, 30 Apr 2021 20:42:38 +0000 (13:42 -0700)]
Handle connection failures on the control channel properly
This patch fixes a bug where a failed control channel connection would
fail to exit early. Status was updated and broadcasted to be connected
even when we were not.
Tag: #stability
Bug:
175275589
Test: atest BluetoothInstrumentationTests
Change-Id: Ic089d6317c4c9c7b8830dd1f1c0ff27cb1d008f2
Myles Watson [Wed, 28 Apr 2021 00:52:21 +0000 (17:52 -0700)]
ACL: Delay early RoleChange until after a ConnectionComplete
Bug:
180137651
Tag: #gd-refactor
Test: cert/run
BYPASS_LONG_LINES_REASON: Bluetooth
Change-Id: I02879eff0dfa9589a240042cb53bf57412214fad
Myles Watson [Fri, 30 Apr 2021 16:14:51 +0000 (16:14 +0000)]
Merge "gd: Implement batch scan" am:
cbe859c150 am:
d4466da865
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1688307
Change-Id: I2026e26e11035e6fea46fb025689dceeaf111038
Myles Watson [Fri, 30 Apr 2021 15:42:56 +0000 (15:42 +0000)]
Merge "gd: Implement batch scan" am:
cbe859c150
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1688307
Change-Id: I73a3df20bc21a168586b4d8c43606e07ead49fa7
Myles Watson [Fri, 30 Apr 2021 15:25:39 +0000 (15:25 +0000)]
Merge "gd: Implement batch scan"
Martin Brabham [Fri, 30 Apr 2021 01:00:01 +0000 (01:00 +0000)]
Disable SecurityRecordStorageTests am:
8bac0c8d52 am:
c58b7690ca
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690695
Change-Id: I0d788fae255408fbced005956f63fe9bbf6d4889
Martin Brabham [Fri, 30 Apr 2021 00:35:26 +0000 (00:35 +0000)]
Disable SecurityRecordStorageTests am:
8bac0c8d52
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690695
Change-Id: I4474cc2781fe4abb15f898ec835aa5b9eb085003
Martin Brabham [Thu, 29 Apr 2021 22:43:02 +0000 (15:43 -0700)]
Disable SecurityRecordStorageTests
Bug:
176170066
Test: atest --host bluetooth_test_gd:SecurityRecordStorageTest (Fails to run/doesn't
exist)
Tag: #refactor
Change-Id: I4aac224fcdd7ee31ce6e672dc4d5b9653b605b7e
Chris Manton [Thu, 29 Apr 2021 22:36:45 +0000 (22:36 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
2901716406 -s ours am:
98e2be17dd am:
0659d4ab56 -s ours am:
344adb8765 am:
1d877974bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954700
Change-Id: I30be69541d799a9abb31e178fa6c735fc104111c
TreeHugger Robot [Thu, 29 Apr 2021 22:36:39 +0000 (22:36 +0000)]
[automerger skipped] Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev am:
529b824a10 am:
0c4a707110 am:
b44e756312 -s ours am:
034a93aada -s ours am:
0e49324ed3 -s ours
am skip reason: Merged-In I7f5b2a3dd0540a922b64ce213d871d355bd6dac6 with SHA-1
71c573ae67 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13516705
Change-Id: Ic22d6d2e72a33c71cc99ebf624091873d377ecec
Chris Manton [Thu, 29 Apr 2021 22:21:23 +0000 (22:21 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
2901716406 -s ours am:
98e2be17dd am:
0659d4ab56 -s ours am:
344adb8765
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954700
Change-Id: I94625a04a7610fff5806b9587ae92dd4694e4f48
TreeHugger Robot [Thu, 29 Apr 2021 22:21:19 +0000 (22:21 +0000)]
[automerger skipped] Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev am:
529b824a10 am:
0c4a707110 am:
b44e756312 -s ours am:
034a93aada -s ours
am skip reason: Merged-In I7f5b2a3dd0540a922b64ce213d871d355bd6dac6 with SHA-1
71c573ae67 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13516705
Change-Id: I70b12a2c5e71b73e413d4825a5ae518ad92e2841
Chris Manton [Thu, 29 Apr 2021 21:59:46 +0000 (21:59 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
2901716406 -s ours am:
98e2be17dd am:
0659d4ab56 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954700
Change-Id: Ic4bb2c4615c9b1501aae916026387f3bf7714170
TreeHugger Robot [Thu, 29 Apr 2021 21:59:34 +0000 (21:59 +0000)]
[automerger skipped] Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev am:
529b824a10 am:
0c4a707110 am:
b44e756312 -s ours
am skip reason: Merged-In I7f5b2a3dd0540a922b64ce213d871d355bd6dac6 with SHA-1
71c573ae67 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13516705
Change-Id: Iab9c72d42c690266379a05974b868ee5bfd0eb24
Martin Brabham [Thu, 29 Apr 2021 21:10:21 +0000 (21:10 +0000)]
Merge "OOB: generateLocalOobdata()" am:
89d078cf99 am:
2e4d9ac7a7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1677348
Change-Id: I12940d922c70fc6a3d001725bd5b8004b412d188
Treehugger Robot [Thu, 29 Apr 2021 21:09:58 +0000 (21:09 +0000)]
Merge "gd: Find and fill TX Power with the correct value" am:
d348c92a3a am:
0d629a20dd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1689575
Change-Id: Ic3bde5dc792f0fe397168beeea55a088bb5fda34
Grzegorz Kołodziejczyk [Thu, 29 Apr 2021 21:09:53 +0000 (21:09 +0000)]
Don't try to do read multiple procedure if only one attribute is to read am:
f0f323c98c am:
8ff0ac0ca8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690792
Change-Id: Iecd18bbbb6ecb1deeb91d36fed03ed0aba0f5a04
Martin Brabham [Thu, 29 Apr 2021 20:53:59 +0000 (20:53 +0000)]
Merge "OOB: generateLocalOobdata()" am:
89d078cf99
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1677348
Change-Id: I9088aca4d645d360dcdd51d32323f19e6b3766b3
Treehugger Robot [Thu, 29 Apr 2021 20:50:54 +0000 (20:50 +0000)]
Merge "gd: Find and fill TX Power with the correct value" am:
d348c92a3a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1689575
Change-Id: Ifd897bad2bc0f3042f5077fdd03fbc5c9d9e477b
Grzegorz Kołodziejczyk [Thu, 29 Apr 2021 20:50:43 +0000 (20:50 +0000)]
Don't try to do read multiple procedure if only one attribute is to read am:
f0f323c98c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690792
Change-Id: I564e48e1183887da32bc053b919002225dcf283b
Martin Brabham [Thu, 29 Apr 2021 18:51:28 +0000 (18:51 +0000)]
Merge "OOB: generateLocalOobdata()"
Treehugger Robot [Thu, 29 Apr 2021 18:33:26 +0000 (18:33 +0000)]
Merge "gd: Find and fill TX Power with the correct value"
Grzegorz Kołodziejczyk [Thu, 29 Apr 2021 16:36:07 +0000 (16:36 +0000)]
Don't try to do read multiple procedure if only one attribute is to read
Read multiple command requires at least two handles to be performed.
Test: Discovery GATT db with single descriptor characteristic
Sponsor: jpawlowski@
Change-Id: I36bb1077ab8fe6adb3c94274b8ffde56086fd611
Chienyuan [Tue, 27 Apr 2021 17:34:27 +0000 (01:34 +0800)]
gd: Implement batch scan
Tag: #gd-refactor
Bug:
186234480
Test: gd/cert/run
Test: bluetooth_test_gd
Test: sl4a, BleOpportunisticScanTest:test_batch_scan_result
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I5060826ff79030cae0bacb44e67acc6f42c6adb4
Chienyuan [Thu, 29 Apr 2021 07:54:49 +0000 (15:54 +0800)]
gd: Find and fill TX Power with the correct value
Tag: #gd-refactor
Bug:
185962046
Test: gd/cert/run
Test: manual
Change-Id: If49961fc02d0cdebc28f0d8d247a98ed35bcd6b4
Sonny Sasaka [Thu, 29 Apr 2021 06:21:39 +0000 (06:21 +0000)]
Merge "Change build.py ordering for rust and main" am:
6a2c03267e am:
fb9ceed0e1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1668070
Change-Id: Ibd0c00b4f77bc1e8021d3370c3aa6939316de1f3