git.osdn.net Git - android-x86/system-bt.git/log

OSDN Git Service

(root) / android-x86 / system-bt.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 3 Mar 2021 00:51:13 +0000 (00:51 +0000)]

Merge "btif: Return after closing the socket" into qt-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Myles Watson [Fri, 5 Feb 2021 01:30:55 +0000 (17:30 -0800)]

avrcp: Ignore AVCT commands that are too long

Bug: 177611958
Test: compilation
Tag: #security
Change-Id: If914b5928cdf16696eb54bfe91c2869cbbf8e36c

commit | commitdiff | tree

Myles Watson [Thu, 4 Feb 2021 20:54:28 +0000 (12:54 -0800)]

btif: Return after closing the socket

Bug: 175686168
Test: poc in bug
Tag: #security
Change-Id: I3af19be9bee9535e67e4dcbc2584d2084656b817
Merged-In: I3af19be9bee9535e67e4dcbc2584d2084656b817

commit | commitdiff | tree

Myles Watson [Wed, 3 Feb 2021 21:00:11 +0000 (21:00 +0000)]

Merge "avrc_copy_packet: Zero initialize packet" into oc-mr1-dev am: 63480b1eee am: 131b92ac3f am: 6e271b0519 am: 8b3ad63b70

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13287217

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71330bdcfe131e813c2ff56b9342adad2f72a059

commit | commitdiff | tree

Myles Watson [Wed, 3 Feb 2021 20:15:56 +0000 (20:15 +0000)]

Merge "avrc_copy_packet: Zero initialize packet" into oc-mr1-dev am: 63480b1eee am: 131b92ac3f am: 6e271b0519

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13287217

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d2d3d2d29c497982f7a038c2779c03b2a1b486b

commit | commitdiff | tree

Myles Watson [Wed, 3 Feb 2021 19:41:39 +0000 (19:41 +0000)]

Merge "avrc_copy_packet: Zero initialize packet" into oc-mr1-dev am: 63480b1eee am: 131b92ac3f

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13287217

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If58ff39a1a996cf7f897204e5f2585589bbd4708

commit | commitdiff | tree

Myles Watson [Wed, 3 Feb 2021 18:51:32 +0000 (18:51 +0000)]

Merge "avrc_copy_packet: Zero initialize packet" into oc-mr1-dev am: 63480b1eee

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13287217

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff120d88c8b6ef4016df7593e4e6fcd42426581a

commit | commitdiff | tree

Myles Watson [Wed, 3 Feb 2021 18:30:15 +0000 (18:30 +0000)]

Merge "avrc_copy_packet: Zero initialize packet" into oc-mr1-dev

commit | commitdiff | tree

Chienyuan [Thu, 28 Jan 2021 06:08:17 +0000 (14:08 +0800)]

DO NOT MERGE Add mutex for std::map in btif_av.cc

TAG: #security
Bug: 169252501
Test: compilation
Ignore-AOSP-First: security fix
Change-Id: I592c0a9c0e77869999357611aa99f3d9bc53b8b6

commit | commitdiff | tree

Chienyuan [Thu, 28 Jan 2021 06:08:17 +0000 (14:08 +0800)]

DO NOT MERGE Add mutex for std::map in btif_av.cc

TAG: #security
Bug: 169252501
Test: compilation
Ignore-AOSP-First: security fix
Change-Id: I592c0a9c0e77869999357611aa99f3d9bc53b8b6

commit | commitdiff | tree

Chienyuan [Thu, 28 Jan 2021 06:08:17 +0000 (14:08 +0800)]

DO NOT MERGE Add mutex for std::map in btif_av.cc

TAG: #security
Bug: 169252501
Test: compilation
Ignore-AOSP-First: security fix
Change-Id: I592c0a9c0e77869999357611aa99f3d9bc53b8b6

commit | commitdiff | tree

TreeHugger Robot [Fri, 15 Jan 2021 19:07:36 +0000 (19:07 +0000)]

[automerger skipped] Merge "AVRCP: Use calloc to zero reserved fields" into pi-dev am: 52c06e73c1 -s ours am: 13b0bc08af -s ours am: d515359e8b -s ours

am skip reason: Change-Id I7a30edacf8377a9feecbb988b099d60d69b46f87 with SHA-1 8d461a866a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13298159

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9619f3b38abf5f1ac3f022c3c1121432e0f0cc73

commit | commitdiff | tree

TreeHugger Robot [Fri, 15 Jan 2021 18:44:12 +0000 (18:44 +0000)]

[automerger skipped] Merge "AVRCP: Use calloc to zero reserved fields" into pi-dev am: 52c06e73c1 -s ours am: 13b0bc08af -s ours

am skip reason: Change-Id I7a30edacf8377a9feecbb988b099d60d69b46f87 with SHA-1 8d461a866a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13298159

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07d5afb629289c09c5f6d81eebad4de607bd08c0

commit | commitdiff | tree

TreeHugger Robot [Fri, 15 Jan 2021 18:00:26 +0000 (18:00 +0000)]

[automerger skipped] Merge "AVRCP: Use calloc to zero reserved fields" into pi-dev am: 52c06e73c1 -s ours

am skip reason: Change-Id I7a30edacf8377a9feecbb988b099d60d69b46f87 with SHA-1 8d461a866a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13298159

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie23077a7193bc0dd9be6138fa26211949e2253f8

commit | commitdiff | tree

TreeHugger Robot [Fri, 15 Jan 2021 17:20:28 +0000 (17:20 +0000)]

Merge "AVRCP: Use calloc to zero reserved fields" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 7 Jan 2021 18:31:31 +0000 (18:31 +0000)]

Merge "Legacy pairing: Reject device with same BD_ADDR" into oc-mr1-dev am: 93346eae3a am: 522313bb33 am: 2bd6cbf058 am: 3981ced364

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13180128

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7bd582ed5e63d01c027ffae0562e2faa5d35a5b3

commit | commitdiff | tree

TreeHugger Robot [Thu, 7 Jan 2021 18:31:23 +0000 (18:31 +0000)]

Merge "SDP: Only start discovery once" into oc-mr1-dev am: a472b9b2b4 am: 76b56c906b am: dcace8eb22 am: aaca436d01

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13202007

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a68ba852f11441ae4df393f935512d33a461d94

commit | commitdiff | tree

Myles Watson [Thu, 7 Jan 2021 18:31:11 +0000 (18:31 +0000)]

[automerger skipped] AVRCP: Use calloc to zero reserved fields am: 8d461a866a -s ours am: 581a008f10 am: 47d7a7842a am: f1d9dbdb30

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13204458

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie228f745b5ac42647b9c281c30f448b42f674252

commit | commitdiff | tree

TreeHugger Robot [Thu, 7 Jan 2021 17:52:27 +0000 (17:52 +0000)]

Merge "Legacy pairing: Reject device with same BD_ADDR" into oc-mr1-dev am: 93346eae3a am: 522313bb33 am: 2bd6cbf058

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13180128

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If134f91b4a058be7abc5f4a49db1ec99540a2ea5

commit | commitdiff | tree

TreeHugger Robot [Thu, 7 Jan 2021 17:52:23 +0000 (17:52 +0000)]

Merge "SDP: Only start discovery once" into oc-mr1-dev am: a472b9b2b4 am: 76b56c906b am: dcace8eb22

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13202007

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9d0f0222b0c7bed033f41a1b48849ae5bc01ac3

commit | commitdiff | tree

Myles Watson [Thu, 7 Jan 2021 17:52:13 +0000 (17:52 +0000)]

[automerger skipped] AVRCP: Use calloc to zero reserved fields am: 8d461a866a -s ours am: 581a008f10 am: 47d7a7842a

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13204458

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97eb38a9f11c97074dd4cce304c276138c66208f

commit | commitdiff | tree

TreeHugger Robot [Thu, 7 Jan 2021 17:35:10 +0000 (17:35 +0000)]

Merge "Legacy pairing: Reject device with same BD_ADDR" into oc-mr1-dev am: 93346eae3a am: 522313bb33

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13180128

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f8757a8d5049f25b5bade4b5952654ed2317acd

commit | commitdiff | tree

TreeHugger Robot [Thu, 7 Jan 2021 17:35:04 +0000 (17:35 +0000)]

Merge "SDP: Only start discovery once" into oc-mr1-dev am: a472b9b2b4 am: 76b56c906b

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13202007

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2b43895ad5be40059b9a81bf257906a958c40da

commit | commitdiff | tree

Myles Watson [Thu, 7 Jan 2021 17:34:53 +0000 (17:34 +0000)]

[automerger skipped] AVRCP: Use calloc to zero reserved fields am: 8d461a866a -s ours am: 581a008f10

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13204458

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib996cf0eaacc56daaff94a0e80d44e1d5191dbba

commit | commitdiff | tree

TreeHugger Robot [Thu, 7 Jan 2021 17:11:30 +0000 (17:11 +0000)]

Merge "Legacy pairing: Reject device with same BD_ADDR" into oc-mr1-dev am: 93346eae3a

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13180128

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I326bc7a210baab0d1367ec4ae49d5d76c37a5db8

commit | commitdiff | tree

TreeHugger Robot [Thu, 7 Jan 2021 17:11:24 +0000 (17:11 +0000)]

Merge "SDP: Only start discovery once" into oc-mr1-dev am: a472b9b2b4

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13202007

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8aec47cad617ef5d908677365ffba53dc16c5fb8

commit | commitdiff | tree

Myles Watson [Thu, 7 Jan 2021 17:11:01 +0000 (17:11 +0000)]

[automerger skipped] AVRCP: Use calloc to zero reserved fields am: 8d461a866a -s ours

am skip reason: skipped by user mylesgw

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13204458

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide49f779dd1318246564d05173387dc7535e52ae

commit | commitdiff | tree

Myles Watson [Fri, 4 Dec 2020 20:54:27 +0000 (12:54 -0800)]

AVRCP: Use calloc to zero reserved fields

Bug: 174150451
Test: compilation
Tag: #security
Change-Id: I7a30edacf8377a9feecbb988b099d60d69b46f87
(cherry picked from commit 1f169323d335ab0dc260952c2dd3821144448b11)
Merged-In: I7a30edacf8377a9feecbb988b099d60d69b46f87
(cherry picked from commit 8d461a866a12cd3d7d6d68551a5d2a7139fab2b9)

commit | commitdiff | tree

TreeHugger Robot [Wed, 6 Jan 2021 23:30:55 +0000 (23:30 +0000)]

Merge "Legacy pairing: Reject device with same BD_ADDR" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 6 Jan 2021 22:27:31 +0000 (22:27 +0000)]

Merge "SDP: Only start discovery once" into oc-mr1-dev

commit | commitdiff | tree

Hansong Zhang [Fri, 11 Dec 2020 19:56:15 +0000 (11:56 -0800)]

avrc_copy_packet: Zero initialize packet

Bug: 174149901
Change-Id: Iefa41749ebbacd34afaa24131de7ee25d706e23f
Tag: Security
Test: POC
(cherry picked from commit 960c3f3c9a1f912544b92b7a744e22069a0bc27e)

commit | commitdiff | tree

Myles Watson [Fri, 4 Dec 2020 20:54:27 +0000 (12:54 -0800)]

AVRCP: Use calloc to zero reserved fields

Bug: 174150451
Test: compilation
Tag: #security
Change-Id: I7a30edacf8377a9feecbb988b099d60d69b46f87
(cherry picked from commit 1f169323d335ab0dc260952c2dd3821144448b11)
Merged-In: I7a30edacf8377a9feecbb988b099d60d69b46f87

commit | commitdiff | tree

Myles Watson [Fri, 4 Dec 2020 02:54:14 +0000 (18:54 -0800)]

SDP: Only start discovery once

Bug: 174052148
Test: pair with headphones
Tag: #security
Change-Id: I1d014a7b793bb1b66e26652f6696499ea36a6510
(cherry picked from commit cfa5a74ea90a09e1c7413a25f04332ee2d1e3f21)
Merged-In: I1d014a7b793bb1b66e26652f6696499ea36a6510

commit | commitdiff | tree

Hansong Zhang [Mon, 7 Dec 2020 21:11:10 +0000 (13:11 -0800)]

Legacy pairing: Reject device with same BD_ADDR

Change-Id: If3daec91c3d108a4e7e988608e0600c79ea5f053
Tag: #vulnerability
Test: manual
Bug: 174626251

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 08:04:51 +0000 (08:04 +0000)]

[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-dev am: 59304cd9d9 am: 16814b34fb -s ours am: 27feab80ac -s ours am: 8679ae4002 -s ours am: e089c72645 -s ours am: 206766da1a -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 ccbe059808 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12781555

Change-Id: I47164d343b5e6e04ab8e26244efe2ece23027bd2

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 07:49:32 +0000 (07:49 +0000)]

[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-dev am: 59304cd9d9 am: 16814b34fb -s ours am: 27feab80ac -s ours am: 8679ae4002 -s ours am: e089c72645 -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 ccbe059808 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12781555

Change-Id: I9c1ddf62a3f3be22331dc83f91a00e6d70a48016

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 07:32:10 +0000 (07:32 +0000)]

[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-dev am: 59304cd9d9 am: 16814b34fb -s ours am: 27feab80ac -s ours am: 8679ae4002 -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 ccbe059808 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12781555

Change-Id: I8994cd9454395c1ef7e7cd387c342f81e4a7f06e

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 07:14:25 +0000 (07:14 +0000)]

[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-dev am: 59304cd9d9 am: 16814b34fb -s ours am: 27feab80ac -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 ccbe059808 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12781555

Change-Id: Id5df4067761338488fab280586f4c3812c246e8d

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 06:55:53 +0000 (06:55 +0000)]

[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-dev am: 59304cd9d9 am: 16814b34fb -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 ccbe059808 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12781555

Change-Id: I28095eaddb51067420afdc51b3fb8245d65047fc

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 06:23:52 +0000 (06:23 +0000)]

[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-mr1-dev am: e1aed6e373 -s ours am: 0a7502bb9a -s ours am: 1d2eb5ae02 -s ours am: 260c2e875c -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 8216eda074 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12778874

Change-Id: I73acbccc3118e746bc504e51c7a7fe77a9b9577e

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 06:23:47 +0000 (06:23 +0000)]

[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-mr1-dev am: e1aed6e373 -s ours am: 0a7502bb9a -s ours am: 1d2eb5ae02 -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 8216eda074 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12778874

Change-Id: I41149474683ad9a985b7531c42e4637304e196f5

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 06:23:47 +0000 (06:23 +0000)]

[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into pi-dev am: a3296c0750 -s ours am: 9b8b7e7f27 -s ours am: 7c360fe435 -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 26d2f1d06a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12778873

Change-Id: I1dd6c468f6f0ed1b1b88f84efd85dbc661883e69

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 06:23:41 +0000 (06:23 +0000)]

[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into pi-dev am: a3296c0750 -s ours am: 9b8b7e7f27 -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 26d2f1d06a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12778873

Change-Id: Iecc69a32a35925ee95eac84494aa40be2fdb72ab

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 06:23:34 +0000 (06:23 +0000)]

[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into qt-dev am: 94c5c10cdd -s ours am: 41f3b19e7e -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 3a41065d41 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12778872

Change-Id: Ib1b9b24598837206aefbb6013a8d5df08d290163

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 06:20:17 +0000 (06:20 +0000)]

[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-mr1-dev am: e1aed6e373 -s ours am: 0a7502bb9a -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 8216eda074 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12778874

Change-Id: I0c52de9f785ac2cb9a703adfcc8f19c68b635f69

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 06:20:08 +0000 (06:20 +0000)]

[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into pi-dev am: a3296c0750 -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 26d2f1d06a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12778873

Change-Id: I59247f8bdb3119e33990038381ac68a85766dd6f

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 06:20:03 +0000 (06:20 +0000)]

Merge "Fix potential OOB write in libbluetooth" into oc-dev am: 59304cd9d9

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12781555

Change-Id: I905bd02ad475b238005d0589a1c0171d842d7201

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 06:19:55 +0000 (06:19 +0000)]

[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into qt-dev am: 94c5c10cdd -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 3a41065d41 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12778872

Change-Id: Ifc1fb0c42cf9bfed5a25154f43960017441b8685

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 06:19:52 +0000 (06:19 +0000)]

[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-mr1-dev am: e1aed6e373 -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 8216eda074 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12778874

Change-Id: I38e0bcf46b33e303fa1ee9e4a5981131935df028

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 06:19:39 +0000 (06:19 +0000)]

Merge "Fix potential OOB write in libbluetooth" into qt-qpr1-dev am: c1d503c7ed

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12778871

Change-Id: I50e8f23b513d444cca991fd5041c1047503b26c1

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 05:51:59 +0000 (05:51 +0000)]

Merge "Fix potential OOB write in libbluetooth" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 05:51:59 +0000 (05:51 +0000)]

Merge "Fix potential OOB write in libbluetooth" into qt-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 05:51:59 +0000 (05:51 +0000)]

Merge "Fix potential OOB write in libbluetooth" into rvc-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 05:51:58 +0000 (05:51 +0000)]

Merge "Fix potential OOB write in libbluetooth" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 05:51:58 +0000 (05:51 +0000)]

Merge "Fix potential OOB write in libbluetooth" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Nov 2020 05:51:58 +0000 (05:51 +0000)]

Merge "Fix potential OOB write in libbluetooth" into qt-qpr1-dev

commit | commitdiff | tree

Myles Watson [Fri, 6 Nov 2020 02:51:27 +0000 (02:51 +0000)]

[automerger skipped] ACL: Drop broadcasts am: f91dbe2985 am: 10cfa5e827 am: e21d07e16e -s ours am: de31f09430 -s ours am: 776ffab7af -s ours am: 7312df48e5 -s ours

am skip reason: Change-Id Id4231fd7a142d630a2ada0f41a90e01afc011045 with SHA-1 83c32e8e8c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12951241

Change-Id: I42bb4bab2a66fae379131e2ced2c91c05ace268c

commit | commitdiff | tree

Myles Watson [Fri, 6 Nov 2020 02:30:04 +0000 (02:30 +0000)]

[automerger skipped] ACL: Drop broadcasts am: f91dbe2985 am: 10cfa5e827 am: e21d07e16e -s ours am: de31f09430 -s ours am: 776ffab7af -s ours

am skip reason: Change-Id Id4231fd7a142d630a2ada0f41a90e01afc011045 with SHA-1 83c32e8e8c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12951241

Change-Id: If3b119f99604729ba276271b28dee89e540d75a7

commit | commitdiff | tree

Myles Watson [Fri, 6 Nov 2020 02:12:38 +0000 (02:12 +0000)]

[automerger skipped] ACL: Drop broadcasts am: f91dbe2985 am: 10cfa5e827 am: e21d07e16e -s ours am: de31f09430 -s ours

am skip reason: Change-Id Id4231fd7a142d630a2ada0f41a90e01afc011045 with SHA-1 83c32e8e8c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12951241

Change-Id: I53768da66285cc776fb47931964282ed6211b1b1

commit | commitdiff | tree

Myles Watson [Fri, 6 Nov 2020 01:18:23 +0000 (01:18 +0000)]

[automerger skipped] ACL: Drop broadcasts am: f91dbe2985 am: 10cfa5e827 am: e21d07e16e -s ours

am skip reason: Change-Id Id4231fd7a142d630a2ada0f41a90e01afc011045 with SHA-1 83c32e8e8c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12951241

Change-Id: I2c0a49d927f48b823a808b45aa871768d0fff05c

commit | commitdiff | tree

Myles Watson [Fri, 6 Nov 2020 01:18:17 +0000 (01:18 +0000)]

ACL: Drop broadcasts am: 83c32e8e8c am: f4ae956619 am: 7b8e29fe9d

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12951249

Change-Id: I677f8f139118e2b6f7128a41dbb8f8c548ab2433

commit | commitdiff | tree

Myles Watson [Fri, 6 Nov 2020 01:05:39 +0000 (01:05 +0000)]

ACL: Drop broadcasts am: 83c32e8e8c am: f4ae956619

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12951249

Change-Id: I664996c28ee502bae3b5dba0d97f45e6f5e244bc

commit | commitdiff | tree

Myles Watson [Fri, 6 Nov 2020 01:05:27 +0000 (01:05 +0000)]

ACL: Drop broadcasts am: f91dbe2985 am: 10cfa5e827

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12951241

Change-Id: I2e274a4614d10187586949a742a9d6716778bc28

commit | commitdiff | tree

Myles Watson [Fri, 6 Nov 2020 00:51:32 +0000 (00:51 +0000)]

ACL: Drop broadcasts am: 83c32e8e8c

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12951249

Change-Id: Ib7004546cc8e6dc05b13ca1a009e3c43eeb910b9

commit | commitdiff | tree

Myles Watson [Fri, 6 Nov 2020 00:51:21 +0000 (00:51 +0000)]

ACL: Drop broadcasts am: f91dbe2985

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12951241

Change-Id: I490deea8c83019ec92f6c76a276c50495cd40cdc

commit | commitdiff | tree

Myles Watson [Thu, 29 Oct 2020 20:05:21 +0000 (13:05 -0700)]

ACL: Drop broadcasts

Bug: 169327567
Test: compiles
Tag: #security
Change-Id: Id4231fd7a142d630a2ada0f41a90e01afc011045
Merged-In: Id4231fd7a142d630a2ada0f41a90e01afc011045

commit | commitdiff | tree

Myles Watson [Thu, 29 Oct 2020 20:05:21 +0000 (13:05 -0700)]

ACL: Drop broadcasts

Bug: 169327567
Test: compiles
Tag: #security
Change-Id: Id4231fd7a142d630a2ada0f41a90e01afc011045
Merged-In: Id4231fd7a142d630a2ada0f41a90e01afc011045

commit | commitdiff | tree

Chris Manton [Thu, 22 Oct 2020 23:28:07 +0000 (23:28 +0000)]

[automerger skipped] Check a2dp packet length is zero am: 1e7e2e2f3f -s ours

am skip reason: Change-Id I105b445293c02cb4f37c759fd5b05758fd4e3646 with SHA-1 d61cf5fe04 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12893689

Change-Id: Iee3994fd52bf4736845b8c0501ae70074a095d01

commit | commitdiff | tree

Chris Manton [Tue, 10 Mar 2020 15:59:02 +0000 (08:59 -0700)]

Check a2dp packet length is zero

Bug: 142546668
Bug: 168254957
Test: net_test_stack_a2dp_native

Change-Id: I105b445293c02cb4f37c759fd5b05758fd4e3646
Merged-In: I105b445293c02cb4f37c759fd5b05758fd4e3646

system/bt

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.