OSDN Git Service
Chris Manton [Mon, 3 May 2021 04:35:18 +0000 (04:35 +0000)]
Const-ify the bta/hh/bta_hh::API data types am:
ee6b8adcd1 am:
df48c8caf4 am:
1b6a5b8bc6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692798
Change-Id: I2d7681d7b0495fad4982e8d62b9206664263cbd8
Chris Manton [Mon, 3 May 2021 04:35:16 +0000 (04:35 +0000)]
Remove unused member tHID_HOST_DEV_CTB::conn_substate am:
a67b1f54c9 am:
cf27c01f85 am:
4aea75a9e9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692797
Change-Id: I336b6a5cc70956b9a150524abab065493696eee6
Chris Manton [Mon, 3 May 2021 04:35:15 +0000 (04:35 +0000)]
Move stack/l2cap::text from compilation unit into header am:
3fbc096f45 am:
d711032263 am:
c1622e0415
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692794
Change-Id: I1344021dc4db15baf681f6a1c9831f745eab7961
Chris Manton [Mon, 3 May 2021 04:35:13 +0000 (04:35 +0000)]
Add BTA_ID_HH for logging am:
568b92ff38 am:
6e6cdb942b am:
db25173a7d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692793
Change-Id: I1b7e209d0064fecc4c86e749de6caf7b63dafdcb
Chris Manton [Mon, 3 May 2021 04:35:12 +0000 (04:35 +0000)]
Add include/hardware/bt_hh::bthh_connection_state_text am:
df8fbbf2b6 am:
e7d8d3d11d am:
3249ff0aae
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692792
Change-Id: Ib170f09a477d91120a1ed9e0b687039fcd5b8a15
Chris Manton [Mon, 3 May 2021 04:35:10 +0000 (04:35 +0000)]
Remove unused declaration am:
f260dc6e96 am:
ed8f21eb6e am:
a5bc267a79
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692791
Change-Id: I97f257af63a651c7d7f9dc38c12f6ab9bbb5578d
Chris Manton [Mon, 3 May 2021 04:35:08 +0000 (04:35 +0000)]
btm_log: Streamline hid logging am:
f7dd3dd0bf am:
19c19a4670 am:
161efa66c5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692790
Change-Id: Ic359e50db2c20eab702f966c426e74d8661b3b83
Chris Manton [Mon, 3 May 2021 04:35:05 +0000 (04:35 +0000)]
log: Swap proper initiator am:
0973f8d157 am:
8561ca0747 am:
8f337f5984
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692789
Change-Id: I5c2bb0f42ee731f3e8ec395561c2678a1cbf523f
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: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 [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
Treehugger Robot [Sat, 1 May 2021 21:08:24 +0000 (21:08 +0000)]
Merge "ScanningManagerTest: Wait for the Filter command" am:
81ce4d3e70 am:
c6c847e0ca am:
27ee277b31
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692906
Change-Id: I20b1128631239618dbfa9fff8495c49bbb5b5735
Myles Watson [Sat, 1 May 2021 21:08:18 +0000 (21:08 +0000)]
GD: Split tests into module vs unit tests am:
479f99dcab am:
7dc3cfa2e7 am:
46f41b424b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692905
Change-Id: Id95720ea67900a11248b7e278bb8302d220dbd90
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
Erwin Jansen [Sat, 1 May 2021 01:49:14 +0000 (01:49 +0000)]
Enable missing HCI cmds in rootcanal am:
1d73e8ba2d am:
e58c9943ff am:
a90cc073b5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692659
Change-Id: Ie5304fb47164e5b84e7f559970b02d18727024d6
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 23:12:30 +0000 (23:12 +0000)]
Merge "ACL: Delay early RoleChange until after a ConnectionComplete" am:
caa93c7426 am:
4daf80a5b9 am:
78eb8946b0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1688961
Change-Id: Ie7da3d63ba1ee3373f66fef355d4db061c3a2c6b
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
Erwin Jansen [Fri, 30 Apr 2021 22:30:54 +0000 (22:30 +0000)]
Merge "Compilation fixes for MSVC" am:
4e04984bb3 am:
5e9105e82b am:
807e9910ff
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1688811
Change-Id: Ie0f4ac0321a047ab8fefe0baf4882da7e57e406f
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
Treehugger Robot [Fri, 30 Apr 2021 22:00:42 +0000 (22:00 +0000)]
Merge changes I02cc2057,Icb879814,I468ac585,Idf93afcf,If3006967, ... am:
f54f80ed1e am:
a6efacd756 am:
beb2aba8a2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1680525
Change-Id: Ied9619c078bedb4b1bfad9c2ed04eb8d0b3b7d5f
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
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:31:13 +0000 (16:31 +0000)]
Merge "gd: Implement batch scan" am:
cbe859c150 am:
d4466da865 am:
fc54cf814e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1688307
Change-Id: If7de00680b028744789d18dcaad88fd0116f3502
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:40:27 +0000 (01:40 +0000)]
Disable SecurityRecordStorageTests am:
8bac0c8d52 am:
c58b7690ca am:
9af91ec6d6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690695
Change-Id: I0cc7eca29e6b1d951f3dce57a5f266bc0d85d494
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
Chris Manton [Thu, 29 Apr 2021 22:54:40 +0000 (22:54 +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 am:
07d73978a1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954700
Change-Id: I1c813c1de73aa58d200f43ae69890c59d96a4ccc
TreeHugger Robot [Thu, 29 Apr 2021 22:54:27 +0000 (22:54 +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:
4b299e641b -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: I5c4b5a0c1b0ffeb8fc0961ea4088632f800480e7
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:37:33 +0000 (22:37 +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:
1e40edc4a2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954700
Change-Id: I4d398758a5aeffc73e37a649e21dcf0496ed897b
TreeHugger Robot [Thu, 29 Apr 2021 22:37:28 +0000 (22:37 +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:
8647e53410 -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: I3e4c696761765ea49de38f8edd2ad7d4f452d6eb
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:23:06 +0000 (22:23 +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: Iee06b42ad400e080c618b33f2df735c36bf68f0f
TreeHugger Robot [Thu, 29 Apr 2021 22:22:57 +0000 (22:22 +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: I6180100d4019018762c9533889467c61f3e65220
Jeff Sharkey [Thu, 29 Apr 2021 22:22:26 +0000 (22:22 +0000)]
Merge "Ensure privileged APIs require runtime permission." into sc-dev
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:32:57 +0000 (21:32 +0000)]
Merge "OOB: generateLocalOobdata()" am:
89d078cf99 am:
2e4d9ac7a7 am:
2bdc37ef01
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1677348
Change-Id: Ib3cb259bac71421745149395232093bc3656880c
Treehugger Robot [Thu, 29 Apr 2021 21:32:41 +0000 (21:32 +0000)]
Merge "gd: Find and fill TX Power with the correct value" am:
d348c92a3a am:
0d629a20dd am:
cb9867b82d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1689575
Change-Id: Ibd94dfa2dda62786b24046aa33e329b381a885ae
Grzegorz Kołodziejczyk [Thu, 29 Apr 2021 21:31:21 +0000 (21:31 +0000)]
Don't try to do read multiple procedure if only one attribute is to read am:
f0f323c98c am:
8ff0ac0ca8 am:
0abed562aa
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690792
Change-Id: Ic72426f1a599cc6bfa17c37a78b8ef5970062e30
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
Jeff Sharkey [Thu, 29 Apr 2021 01:53:37 +0000 (19:53 -0600)]
Ensure privileged APIs require runtime permission.
When users revoke a runtime permission, they expect all interactions
to be blocked, including those protected by the BLUETOOTH_PRIVILEGED
permission.
This change finishes applying that policy to any remaining Bluetooth
APIs which didn't already implement it. To keep the implementation
straightforward, this change does "data delivery" checks when
registering for callbacks; the ideal behavior would be to wait
until data is actually delivered through the callbacks, but
RemoteCallbackList doesn't have support for AttributionSource yet.
Bug:
186405452
Test: atest BluetoothInstrumentationTests
Change-Id: I802e31593906082ef7590002c5d1feba69314cec
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:38:52 +0000 (06:38 +0000)]
Merge "Change build.py ordering for rust and main" am:
6a2c03267e am:
fb9ceed0e1 am:
b1f2fc937f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1668070
Change-Id: I477dbec19619ad83a3cc56c448ca5d2c734e0913
Sonny Sasaka [Thu, 29 Apr 2021 06:38:43 +0000 (06:38 +0000)]
Merge "Fixes for Linux build" am:
22a183c1f9 am:
021ca6d985 am:
2ebe527baa
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687437
Change-Id: I80d9d907016d672c2ada13de4bc1e46092140fc5
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
Sonny Sasaka [Thu, 29 Apr 2021 06:21:34 +0000 (06:21 +0000)]
Merge "Fixes for Linux build" am:
22a183c1f9 am:
021ca6d985
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687437
Change-Id: Id7316ae8f32d0b8f31350b03f7727a23c289b8fd
Sonny Sasaka [Thu, 29 Apr 2021 05:43:12 +0000 (05:43 +0000)]
Merge "Change build.py ordering for rust and main" am:
6a2c03267e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1668070
Change-Id: I6ab60d8afed2f5fc2c45b9b9c7b150aee1558ddb
Sonny Sasaka [Thu, 29 Apr 2021 05:42:28 +0000 (05:42 +0000)]
Merge "Fixes for Linux build" am:
22a183c1f9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687437
Change-Id: I84f7c32bce87dc49aed0f2b65200c2c667192d22
OSDN Git Service
