OSDN Git Service
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
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
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