OSDN Git Service
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
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
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: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
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: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
TreeHugger Robot [Fri, 5 Mar 2021 06:15:47 +0000 (06:15 +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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13756432
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5c72d7510d4040f7ca24056bc3e9ea30446318d2
TreeHugger Robot [Fri, 5 Mar 2021 06:15:35 +0000 (06:15 +0000)]
Merge "avrcp: Ignore AVCT commands that are too long" into oc-mr1-dev am:
c89971ccbb am:
c1282f371b am:
fc6a2327ac am:
b01c117452
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13490135
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If7045749c4f2925f0a638650abdda13490db2e63
TreeHugger Robot [Fri, 5 Mar 2021 05:54:58 +0000 (05:54 +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
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13756432
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e1dc81731f98a1f4d12f04d9466829b5a223bf4
TreeHugger Robot [Fri, 5 Mar 2021 05:54:51 +0000 (05:54 +0000)]
Merge "avrcp: Ignore AVCT commands that are too long" into oc-mr1-dev am:
c89971ccbb am:
c1282f371b am:
fc6a2327ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13490135
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If42003a10b559a9e8dd9a0c0732958ac98c78911
Treehugger Robot [Fri, 5 Mar 2021 05:50:35 +0000 (05:50 +0000)]
Merge "Bluetooth hal metrics: Add LogBluetoothHalCrashReason" am:
2ad2fc4b2a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1597873
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2512d4cf56b2cfa8138e522aa3d99689e826b9ee
Sal Savage [Fri, 5 Mar 2021 05:47:38 +0000 (05:47 +0000)]
Merge "Exit notification timeouts immediately for disconnected devices" am:
f0f8c689b5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1609997
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3750f19b3dcbde7bc23506db6cf59f22e6f52e6b
Hansong Zhang [Fri, 5 Mar 2021 05:44:08 +0000 (05:44 +0000)]
Some dependencies are host supported am:
70f01015e1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1613820
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I40db392c31b09262b2f92a3df78add379259a421
Hansong Zhang [Fri, 5 Mar 2021 05:43:22 +0000 (05:43 +0000)]
Add host support for libbluetooth.so am:
75847f0c0b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1612800
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e822228a3c06062d5af1bcc402ca3e78be95c22
Chienyuan [Fri, 5 Mar 2021 05:35:58 +0000 (05:35 +0000)]
gd: Fix address manager bug am:
2e0e8680a0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1614948
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I373e704d0eb6347ddb2d649f88501781aad5f4a6
TreeHugger Robot [Fri, 5 Mar 2021 05:12:39 +0000 (05:12 +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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13756432
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifd7eb81d9b7a75384ee20175174550fa06900364
TreeHugger Robot [Fri, 5 Mar 2021 05:12:31 +0000 (05:12 +0000)]
Merge "avrcp: Ignore AVCT commands that are too long" into oc-mr1-dev am:
c89971ccbb am:
c1282f371b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13490135
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4cdb26816f81d622d9aed94f176a7cfd2360b1b8
Treehugger Robot [Fri, 5 Mar 2021 04:35:11 +0000 (04:35 +0000)]
Merge "Bluetooth hal metrics: Add LogBluetoothHalCrashReason"
TreeHugger Robot [Fri, 5 Mar 2021 04:25:22 +0000 (04:25 +0000)]
[automerger skipped] Merge "DO NOT MERGE : Re-land: SMP: Validate remote elliptic curve points" into oc-mr1-dev am:
cfc256e14d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13756432
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic2e529ad7118c58426893175823dd3c5cc424817
TreeHugger Robot [Fri, 5 Mar 2021 04:25:17 +0000 (04:25 +0000)]
Merge "avrcp: Ignore AVCT commands that are too long" into oc-mr1-dev am:
c89971ccbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13490135
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2eb64b02fbecffcb2927dd9a6157822076ec26fb
Sal Savage [Fri, 5 Mar 2021 02:03:42 +0000 (02:03 +0000)]
Merge "Exit notification timeouts immediately for disconnected devices"
Myles Watson [Fri, 5 Mar 2021 00:46:54 +0000 (00:46 +0000)]
smp: Use SMP_TRACE_WARNING am:
4567823871 am:
3d5118b2ae am:
db97c71539 am:
7447be7dd5 am:
0cce7e32fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13758553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I72f23863b671f45aed226b30119a25562acf019b
Myles Watson [Fri, 5 Mar 2021 00:46:38 +0000 (00:46 +0000)]
smp: Reject pairing if the public keys match am:
b7e176df4b am:
384a93f2b5 am:
d7649413ad am:
d501a765c9 am:
a58ff17c3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13522371
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic47fa3b5cd43a2b523fa18af751e4d15ef36bd5b
Hansong Zhang [Wed, 3 Mar 2021 01:30:10 +0000 (17:30 -0800)]
Some dependencies are host supported
Bug:
181590011
Tag: #refactor
Test: compile
Change-Id: I247a300c3ba35715b5ddb8c06523e71189ba0ab5
Hansong Zhang [Tue, 2 Mar 2021 01:52:04 +0000 (17:52 -0800)]
Add host support for libbluetooth.so
Bug:
181590011
Tag: #refactor
Test: compile
Change-Id: I9a53eeaac5a5c612d47671bca4f95cf252faeb93
Myles Watson [Thu, 4 Mar 2021 23:52:20 +0000 (23:52 +0000)]
Merge "resolve merge conflicts of
c4a376463ad3ef2df25f57624edbd5ec4e90d48c to rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp
TreeHugger Robot [Thu, 4 Mar 2021 23:45:46 +0000 (23:45 +0000)]
Merge "DO NOT MERGE : Re-land: SMP: Validate remote elliptic curve points" into oc-mr1-dev
TreeHugger Robot [Thu, 4 Mar 2021 23:18:24 +0000 (23:18 +0000)]
Merge "avrcp: Ignore AVCT commands that are too long" into oc-mr1-dev
Andre Eisenbach [Thu, 1 Mar 2018 21:27:01 +0000 (13:27 -0800)]
DO NOT MERGE : Re-land: SMP: Validate remote elliptic curve points
Fixes:
72377774
Test: net_test_stack_smp (where applicable)
(cherry picked from commit
9181ec28da94705a763edbe60bd2a87e5f882beb)
Change-Id: Ic38ad2f447a6a675025c84fd7746c9124f1eb324
Chienyuan [Thu, 4 Mar 2021 13:36:50 +0000 (21:36 +0800)]
gd: Fix address manager bug
Tag: #gd-refactor
Bug:
180869951
Test: gd/cert/run
Change-Id: Ia04aea10c686c8c4ec8985f2ba3f3424691ea825
weichinweng [Tue, 15 Dec 2020 06:56:19 +0000 (14:56 +0800)]
Bluetooth hal metrics: Add LogBluetoothHalCrashReason
Add LogBluetoothHalCrashReason function to collect Bluetooth hal crash
reason.
Bug:
174284338
Tag: #feature
Test: atest BluetoothInstrumentationTests
Change-Id: Ibbc465d3145068fdc7f743b67ae4278b4cdf2430
Myles Watson [Thu, 4 Mar 2021 04:21:53 +0000 (04:21 +0000)]
Merge "RootCanal: Disable LeExtendedAdvertising" am:
e862a44ff4 am:
742c33e81e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1617639
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1e6e8f4fe62222f409a2006fa8dd4907e27b0fed
Myles Watson [Thu, 4 Mar 2021 03:22:46 +0000 (03:22 +0000)]
smp: Use SMP_TRACE_WARNING am:
4567823871 am:
3d5118b2ae am:
db97c71539 am:
7447be7dd5
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13758553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia6a2364595636f02962beb4e4feac8fe521d46cd
Myles Watson [Thu, 4 Mar 2021 02:40:45 +0000 (02:40 +0000)]
Merge "RootCanal: Disable LeExtendedAdvertising" am:
e862a44ff4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1617639
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e05c4114e21d87302e0d2d7277ef358dc01108f
Myles Watson [Thu, 4 Mar 2021 01:42:15 +0000 (01:42 +0000)]
smp: Use SMP_TRACE_WARNING am:
4567823871 am:
3d5118b2ae am:
db97c71539
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13758553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iccb68d84d5c6c84797a90c386f081d061ef72671
Myles Watson [Thu, 4 Mar 2021 01:40:01 +0000 (01:40 +0000)]
resolve merge conflicts of
c4a376463ad3ef2df25f57624edbd5ec4e90d48c to rvc-qpr-dev-plus-aosp
Change-Id: I0df2ad9ed138414bfc4551ec175e086cf7c112a7
Myles Watson [Thu, 4 Mar 2021 01:20:12 +0000 (01:20 +0000)]
Merge "RootCanal: Disable LeExtendedAdvertising"
Myles Watson [Thu, 4 Mar 2021 00:31:17 +0000 (00:31 +0000)]
smp: Use SMP_TRACE_WARNING am:
4567823871 am:
3d5118b2ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13758553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibd31c210968f8f4809dad8339fbb45585d23548f
Myles Watson [Wed, 3 Mar 2021 23:55:52 +0000 (23:55 +0000)]
smp: Use SMP_TRACE_WARNING am:
4567823871
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13758553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2dab9afcd509f6f5082f69965c065a881e0bb64a
Myles Watson [Wed, 3 Mar 2021 23:23:33 +0000 (15:23 -0800)]
RootCanal: Disable LeExtendedAdvertising
Bug:
181783722
Test: cert/run
Tag: #gd-refactor
Change-Id: I1e687b9177211385f62aff39db59c312db3c8c4a
Xin Li [Wed, 3 Mar 2021 23:36:58 +0000 (23:36 +0000)]
[automerger skipped] Merge "Merge RQ2A.210305.007" am:
4ad3a2452a -s ours am:
ea2ec388c5 -s ours
am skip reason: Change-Id I70d48f04611d3bd380b8e29d21e590e69c6bfe0c with SHA-1
a74d9d71fe is in history
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1613672
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaa0822a69cc3068ee2ace7652955f185dc666c51
Xin Li [Wed, 3 Mar 2021 22:28:29 +0000 (22:28 +0000)]
[automerger skipped] Merge "Merge RQ2A.210305.007" am:
4ad3a2452a -s ours
am skip reason: Change-Id I70d48f04611d3bd380b8e29d21e590e69c6bfe0c with SHA-1
a74d9d71fe is in history
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1613672
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6067ee165f3933a9908fc41506602a7aa4d09534
Myles Watson [Wed, 3 Mar 2021 22:00:17 +0000 (22:00 +0000)]
smp: Reject pairing if the public keys match am:
b7e176df4b am:
384a93f2b5 am:
d7649413ad am:
d501a765c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13522371
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6b1c8452941716de72db6f8b54ed054c3002216b
Myles Watson [Wed, 3 Mar 2021 21:49:21 +0000 (13:49 -0800)]
smp: Use SMP_TRACE_WARNING
Bug:
174886838
Test: pair an LE device
Tag: #security
Change-Id: I3c7e0b1dd877dfa29fa0812c6a5e65fcb1d70ea7
Xin Li [Wed, 3 Mar 2021 21:41:36 +0000 (21:41 +0000)]
Merge "Merge RQ2A.210305.007"
Myles Watson [Wed, 3 Mar 2021 20:53:19 +0000 (20:53 +0000)]
smp: Reject pairing if the public keys match am:
b7e176df4b am:
384a93f2b5 am:
d7649413ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13522371
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifd61aee4801775b302e5e5eade5c7010228b8566
Myles Watson [Wed, 3 Mar 2021 20:15:44 +0000 (20:15 +0000)]
smp: Reject pairing if the public keys match am:
b7e176df4b am:
384a93f2b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13522371
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6945ff206f775739e76ee63b66bfe9acdd0c2c9a
Myles Watson [Wed, 3 Mar 2021 19:08:40 +0000 (19:08 +0000)]
smp: Reject pairing if the public keys match am:
b7e176df4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13522371
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If45c76319ea662f40ce02bc8ef9f8d6e2ce9d291
Xin Li [Tue, 2 Mar 2021 23:49:59 +0000 (15:49 -0800)]
Merge RQ2A.210305.007
Bug:
180401296
Merged-In: I70d48f04611d3bd380b8e29d21e590e69c6bfe0c
Change-Id: If5621cce571c1e580be6a7949f945318482146aa
TreeHugger Robot [Wed, 3 Mar 2021 02:59:02 +0000 (02:59 +0000)]
Merge "btif: Return after closing the socket" into qt-dev am:
f77ee94322 am:
656e98853c am:
bc52d62a13
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13486155
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iee3bb154833c4d4ae979f31271dc10b82f96f806
TreeHugger Robot [Wed, 3 Mar 2021 02:16:18 +0000 (02:16 +0000)]
Merge "btif: Return after closing the socket" into qt-dev am:
f77ee94322 am:
656e98853c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13486155
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4551137fac7bff57f27bbdf210d329b058022ea2
TreeHugger Robot [Wed, 3 Mar 2021 01:34:32 +0000 (01:34 +0000)]
Merge "btif: Return after closing the socket" into qt-dev am:
f77ee94322
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13486155
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6f1e224a54b4c8b4ea5618d307e8cad56c64bca
Myles Watson [Wed, 3 Mar 2021 00:54:22 +0000 (00:54 +0000)]
RootCanal: Send LeReadRemoteFeatures to LE address am:
5420443c00 am:
901c3e2052
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1613205
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6de905e2d03d57dc89cd505f7db4a71ea9030239
cheng_cai [Wed, 3 Mar 2021 00:54:17 +0000 (00:54 +0000)]
Fix discover service process using wrong transport am:
54c556ed8a am:
ee0fddd576
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1288519
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I760f45ed06979cb56c39f81ab2b41259e90062dc
TreeHugger Robot [Wed, 3 Mar 2021 00:51:13 +0000 (00:51 +0000)]
Merge "btif: Return after closing the socket" into qt-dev
Myles Watson [Wed, 3 Mar 2021 00:16:07 +0000 (00:16 +0000)]
RootCanal: Send LeReadRemoteFeatures to LE address am:
5420443c00
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1613205
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieb83b765df8949b0f2bd0d8bda12eb82079eff26
cheng_cai [Wed, 3 Mar 2021 00:11:56 +0000 (00:11 +0000)]
Fix discover service process using wrong transport am:
54c556ed8a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1288519
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5df1d9a974f344474f4a52ac247d48ab4a7a4ffc
Treehugger Robot [Tue, 2 Mar 2021 23:01:01 +0000 (23:01 +0000)]
Merge "Shim Scanning: Update device property" am:
b2613c875f am:
a74d9d71fe
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1609573
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic087bddf91d8dedd8eefb4ac6d73e5f31e398c26
Myles Watson [Tue, 2 Mar 2021 21:46:14 +0000 (13:46 -0800)]
RootCanal: Send LeReadRemoteFeatures to LE address
Bug:
181371297
Test: cert/run DirectHciTest
Tag: #gd-refactor
Change-Id: I8b795c2bb440f98fc840a837e2ab27ef35811558
Treehugger Robot [Tue, 2 Mar 2021 22:09:33 +0000 (22:09 +0000)]
Merge "Shim Scanning: Update device property" am:
b2613c875f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1609573
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I70d48f04611d3bd380b8e29d21e590e69c6bfe0c
Chris Manton [Tue, 2 Mar 2021 21:50:55 +0000 (21:50 +0000)]
Merge changes Ia032262c,Ic587965e,I6dc0fcec,I51913698,I17a8ef4f, ... am:
8bc9c37d89 am:
0c2f9c3514
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1611602
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I104e4122720d31f5e5ab3db3890e9e7a234ffad5
Myles Watson [Tue, 2 Mar 2021 21:50:16 +0000 (21:50 +0000)]
Merge "RootCanal: Report actual supported commands" am:
e0f6c7a008 am:
d55f0ad738
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1603835
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6084e2230db9607c624f13f072c345e73f373f73
Chris Manton [Tue, 2 Mar 2021 21:36:52 +0000 (21:36 +0000)]
Merge changes Ia032262c,Ic587965e,I6dc0fcec,I51913698,I17a8ef4f, ... am:
8bc9c37d89
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1611602
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1763a715405459240aa443c8ae39fcffe747e374
Myles Watson [Tue, 2 Mar 2021 21:27:45 +0000 (21:27 +0000)]
Merge "RootCanal: Report actual supported commands" am:
e0f6c7a008
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1603835
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I00bba233a0a92cd21a86f67d2dd7ca5bcbb4ef36
cheng_cai [Fri, 17 Apr 2020 12:12:25 +0000 (20:12 +0800)]
Fix discover service process using wrong transport
Application may use createBond by transport API to bond with a dual mode
device. If the stack doesn’t get a name from the adv packet, the
stack will start to discover remote name before discovering remote
service. As stack will clear the bta_dm_search_cb.transport flag after
searching remote name, the sdp protocol will be used to discover remote
services, but actually it should use gatt protocol.
Bug:
154299225
Test: Create bond with a dual mode device using le transport
Tag: #compatibility
Sponsor: optedoblivion@
Change-Id: I05b9fa9cf9801cf681e195d490d77d61f77e43a3
Hansong Zhang [Tue, 2 Mar 2021 20:41:24 +0000 (20:41 +0000)]
Add host support for audio_hal_interface/ am:
0435ab0c27 am:
65066e2c43
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1612799
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I626738ee077f17d04406c73a18a2f440a4ff387e
Grzegorz Kołodziejczyk [Tue, 2 Mar 2021 20:34:57 +0000 (20:34 +0000)]
BluetoothAudioHAL: Avoid deadlock for get Providers Factory 2.1 am:
6315e27778 am:
8d7ad23ea1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1608413
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib8075e0325832cb7d5fe7d531e8c0b6758204159
Treehugger Robot [Tue, 2 Mar 2021 20:34:38 +0000 (20:34 +0000)]
Merge "Shim Scanning: Update device property"
Chris Manton [Tue, 2 Mar 2021 20:26:56 +0000 (20:26 +0000)]
Merge changes Ia032262c,Ic587965e,I6dc0fcec,I51913698,I17a8ef4f, ...
* changes:
Use API ignore_auto_connect_after_disconnect
Add API ignore_auto_connect_after_disconnect
Streamline stack/btm/btm_sec::btm_sec_disconnected
Streamline stack/btm/btm_sec::btm_sec_send_hci_disconnect
Stat-ify bta/hh/bta_hh_le::bta_hh_le_deregister_input_notif
Streamline bta/hh/bta_hh_le::bta_hh_le_remove_dev_bg_conn
Streamline bta/hh/bta_hh_le::bta_hh_gatt_close
Streamline bta/gatt/bta_gattc_act::bta_gattc_process_api_open_cancel
Streamline stack/hid/hidh_conn::hidh_conn_disconnect
Streamline stack/hid/hidh_conn::hidh_l2cif_disconnect
Canonicalize stack/hid/hidh_conn.cc
Streamline bta/hh/bta_hh_act::bta_hh_api_disc_act
Remove unnecessary declarations btif/src/btif_hh
Streamline btif/src/btif_hh::btif_hh_disconnect
Add le acceptlist size to dumpsys
Remove unnecessary #def guard bta/hh/bta_hh_main::BTA_HH_DEBUG
Explicitly name stack/acl::tACL_CONN
Enum-ify stack/include/hiddefs::tHID_STATUS
Hansong Zhang [Tue, 2 Mar 2021 20:09:51 +0000 (20:09 +0000)]
Add host support for audio_hal_interface/ am:
0435ab0c27
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1612799
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia5bd05c3f8cb4c4786f416ac12fa13f303b52bb4
Grzegorz Kołodziejczyk [Tue, 2 Mar 2021 20:05:50 +0000 (20:05 +0000)]
BluetoothAudioHAL: Avoid deadlock for get Providers Factory 2.1 am:
6315e27778
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1608413
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic0b5391c74078e2c9407b49b59c41374356c5531
Chris Manton [Tue, 2 Mar 2021 19:50:07 +0000 (19:50 +0000)]
Pull up ACL_AcceptLeConnectionFrom stack am:
7252648c47 am:
07615c4791
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1610825
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id5d473d8bdad98162f4dec1f2dd565d7ed926815
Chris Manton [Tue, 2 Mar 2021 19:02:43 +0000 (19:02 +0000)]
Pull up ACL_AcceptLeConnectionFrom stack am:
7252648c47
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1610825
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4d9ecde706384c0111156cf6d22aafb73101ef5b
Myles Watson [Tue, 2 Mar 2021 19:00:33 +0000 (19:00 +0000)]
Merge "RootCanal: Report actual supported commands"
Treehugger Robot [Tue, 2 Mar 2021 18:46:51 +0000 (18:46 +0000)]
Merge "HFPClient: HF Indicators support" am:
d546e7ef9d am:
85885e59d0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1536315
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id984e5df8c5f655cae6142c8843ea8093bd363be
Treehugger Robot [Tue, 2 Mar 2021 18:46:17 +0000 (18:46 +0000)]
Merge "export async_fd_watcher" am:
96665b0602 am:
6c67f961f8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1605335
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I077700c4861751ad849507ce9ab5792c93a75276
TreeHugger Robot [Tue, 2 Mar 2021 18:44:21 +0000 (18:44 +0000)]
Merge "Merge RQ2A.210305.007 into stage." into stage-aosp-master am:
fa84b60443
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13724599
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I640059a6ca8546a0c29f53855ecd9ec8de7656f8
Hansong Zhang [Tue, 2 Mar 2021 01:46:12 +0000 (17:46 -0800)]
Add host support for audio_hal_interface/
Bug:
181590011
Tag: #refactor
Test: compile
Change-Id: Ic47d789dacabc2089f8d63bf9ab67cb480d1d6b7
Chris Manton [Sat, 27 Feb 2021 17:20:48 +0000 (09:20 -0800)]
Use API ignore_auto_connect_after_disconnect
Bug:
180781174
Test: cert
Tag: #refactor
Change-Id: Ia032262c0e136ea7bc7b7bd7a2737b7d67439804
Chris Manton [Sat, 27 Feb 2021 17:19:55 +0000 (09:19 -0800)]
Add API ignore_auto_connect_after_disconnect
Bug:
180781174
Test: cert
Tag: #refactor
Change-Id: Ic587965e57c87174cb39bd0b79321c22842dbbad
Chris Manton [Fri, 26 Feb 2021 20:46:17 +0000 (12:46 -0800)]
Streamline stack/btm/btm_sec::btm_sec_disconnected
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I6dc0fcecc9abd8e29fafa1c60a92c471d394f49c
Chris Manton [Fri, 26 Feb 2021 18:08:40 +0000 (10:08 -0800)]
Streamline stack/btm/btm_sec::btm_sec_send_hci_disconnect
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I51913698328be8eaf096de890c558162d39e8cb2
Chris Manton [Fri, 26 Feb 2021 18:08:27 +0000 (10:08 -0800)]
Stat-ify bta/hh/bta_hh_le::bta_hh_le_deregister_input_notif
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I17a8ef4f1794f23760cf480c161d82b621bbde46
Chris Manton [Fri, 26 Feb 2021 03:16:37 +0000 (19:16 -0800)]
Streamline bta/hh/bta_hh_le::bta_hh_le_remove_dev_bg_conn
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I7e7fe917cbf8b4695f2c209ace1bc0783e5adef9
Chris Manton [Fri, 26 Feb 2021 03:16:26 +0000 (19:16 -0800)]
Streamline bta/hh/bta_hh_le::bta_hh_gatt_close
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I02e2cd2064b387d42269b08fd178c74222cbf2d3
Chris Manton [Fri, 26 Feb 2021 03:15:54 +0000 (19:15 -0800)]
Streamline bta/gatt/bta_gattc_act::bta_gattc_process_api_open_cancel
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I7dbfd0e27fee14ad0161fbe96b6f4a9412503cbb
Chris Manton [Fri, 26 Feb 2021 03:02:54 +0000 (19:02 -0800)]
Streamline stack/hid/hidh_conn::hidh_conn_disconnect
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I9cec9a720ef56e5e73f5830884dcd12abdc875fb
Chris Manton [Fri, 26 Feb 2021 03:02:40 +0000 (19:02 -0800)]
Streamline stack/hid/hidh_conn::hidh_l2cif_disconnect
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I5ee1f8e3f3ec1c1783dab96bd27693721608fdf2
Chris Manton [Fri, 26 Feb 2021 02:53:38 +0000 (18:53 -0800)]
Canonicalize stack/hid/hidh_conn.cc
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I9e233853056f4694d484212c9252fb3e0e9ab41b