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

Chris Manton [Thu, 6 May 2021 16:16:37 +0000 (16:16 +0000)]

[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: d667a2f6d0 -s ours am: 467701e9c8 -s ours am: d590155628

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

Change-Id: I854753665062ccf83b126891e57d4e7eb45f0c51

commit | commitdiff | tree

Chris Manton [Thu, 6 May 2021 16:00:02 +0000 (16:00 +0000)]

[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: d667a2f6d0 -s ours am: 467701e9c8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2079fb2b8678aee870c8748b13ced769b72891d0

commit | commitdiff | tree

Chris Manton [Thu, 6 May 2021 15:45:01 +0000 (15:45 +0000)]

[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: d667a2f6d0 -s ours

am skip reason: skipped by user cmanton

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

Change-Id: I0bda5654aa90b136fef137dc6e24176c9888ff78

commit | commitdiff | tree

Chris Manton [Thu, 29 Apr 2021 22:23:06 +0000 (22:23 +0000)]

[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: 2901716406 -s ours am: 98e2be17dd am: 0659d4ab56 -s ours am: 344adb8765

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

Change-Id: Iee06b42ad400e080c618b33f2df735c36bf68f0f

commit | commitdiff | tree

TreeHugger Robot [Thu, 29 Apr 2021 22:22:57 +0000 (22:22 +0000)]

[automerger skipped] Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev am: 529b824a10 am: 0c4a707110 am: b44e756312 -s ours am: 034a93aada -s ours

am skip reason: Merged-In I7f5b2a3dd0540a922b64ce213d871d355bd6dac6 with SHA-1 71c573ae67 is already in history

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

Change-Id: I6180100d4019018762c9533889467c61f3e65220

commit | commitdiff | tree

Chris Manton [Thu, 29 Apr 2021 21:59:46 +0000 (21:59 +0000)]

[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: 2901716406 -s ours am: 98e2be17dd am: 0659d4ab56 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic4bb2c4615c9b1501aae916026387f3bf7714170

commit | commitdiff | tree

TreeHugger Robot [Thu, 29 Apr 2021 21:59:34 +0000 (21:59 +0000)]

[automerger skipped] Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev am: 529b824a10 am: 0c4a707110 am: b44e756312 -s ours

am skip reason: Merged-In I7f5b2a3dd0540a922b64ce213d871d355bd6dac6 with SHA-1 71c573ae67 is already in history

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

Change-Id: Iab9c72d42c690266379a05974b868ee5bfd0eb24

commit | commitdiff | tree

Chris Manton [Tue, 6 Apr 2021 21:49:02 +0000 (21:49 +0000)]

[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: 2901716406 -s ours am: 98e2be17dd

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

Change-Id: Ia36b28dea2d4e3bc67ef4ed7c8b7280c7a7fb700

commit | commitdiff | tree

Chris Manton [Tue, 6 Apr 2021 21:33:28 +0000 (21:33 +0000)]

RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: 4deeb022c7

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

Change-Id: Ic73065a6d1331e4202cf3aa7863994ec36c2a8c5

commit | commitdiff | tree

Chris Manton [Tue, 6 Apr 2021 21:11:49 +0000 (21:11 +0000)]

[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: 2901716406 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1a5f213361798d7e22a5827ce1e42249af05aa59

commit | commitdiff | tree

Chris Manton [Sun, 21 Mar 2021 22:51:18 +0000 (15:51 -0700)]

RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write

Bug: 181860042
Test: net_test_stack
Tag: #security
Ignore-AOSP-First: Security

Change-Id: I5d8d4051a1439ee9f1f04af3dfe6da6d8016e546

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Apr 2021 00:57:55 +0000 (00:57 +0000)]

Merge "Check packet size in avrc_pars_browse_rsp" into rvc-dev am: 05401e8739

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

Change-Id: Ia6330f75600e3acd96a0025026c3568a391c7777

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Apr 2021 00:22:29 +0000 (00:22 +0000)]

Merge "Check packet size in avrc_pars_browse_rsp" into rvc-dev

commit | commitdiff | tree

Chienyuan [Thu, 1 Apr 2021 04:01:12 +0000 (04:01 +0000)]

AVRCP: pass bdaddr by value when use SdpCb am: 71c573ae67

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

Change-Id: I243ee6b18962d6ebedab62a2499ed7f1940cb98b

commit | commitdiff | tree

Chris Manton [Sun, 21 Mar 2021 22:51:18 +0000 (15:51 -0700)]

RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write

Bug: 181860042
Test: net_test_stack
Tag: #security
Ignore-AOSP-First: Security

Change-Id: I5d8d4051a1439ee9f1f04af3dfe6da6d8016e546

commit | commitdiff | tree

Chris Manton [Sun, 21 Mar 2021 22:51:18 +0000 (15:51 -0700)]

RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write

Bug: 181860042
Test: net_test_stack
Tag: #security
Ignore-AOSP-First: Security

Change-Id: I5d8d4051a1439ee9f1f04af3dfe6da6d8016e546

commit | commitdiff | tree

Chienyuan [Fri, 19 Feb 2021 12:05:20 +0000 (20:05 +0800)]

AVRCP: pass bdaddr by value when use SdpCb

TAG: #security
Bug: 174182139
Test: compilation
Ignore-AOSP-First: security fix
Change-Id: I7f5b2a3dd0540a922b64ce213d871d355bd6dac6
Merged-In: I7f5b2a3dd0540a922b64ce213d871d355bd6dac6

commit | commitdiff | tree

TreeHugger Robot [Wed, 10 Mar 2021 04:30:50 +0000 (04:30 +0000)]

Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev am: 529b824a10 am: 0c4a707110

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c5c3c95e0b5ff3d1ce307b8a1a41555e3def863

commit | commitdiff | tree

TreeHugger Robot [Wed, 10 Mar 2021 02:37:33 +0000 (02:37 +0000)]

Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev am: 529b824a10

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2074374898d9695c550034ff48be0a4b8aaa0383

commit | commitdiff | tree

TreeHugger Robot [Wed, 10 Mar 2021 01:55:07 +0000 (01:55 +0000)]

Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev

commit | commitdiff | tree

Myles Watson [Fri, 5 Mar 2021 23:35:12 +0000 (23:35 +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: I7a1ee36ae740afe8609e78e976bdf1558dfe312e

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

TreeHugger Robot [Fri, 5 Mar 2021 08:07:58 +0000 (08:07 +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: I812b6257f68f0d8b1b83685fa69e5de4ecf7d5aa

commit | commitdiff | tree

TreeHugger Robot [Fri, 5 Mar 2021 08:07:52 +0000 (08:07 +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: Ie228842f0dd1b0e8b8d34bd90809e79bbd222379

commit | commitdiff | tree

Chienyuan [Fri, 5 Mar 2021 08:07:50 +0000 (08:07 +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: Id401aae790266cf8b1aae8feec5582381e54efd4

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 07:06:37 +0000 (07:06 +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: I908db5b02d91112d78691ae331ac464cb280ce3e

commit | commitdiff | tree

Chienyuan [Fri, 5 Mar 2021 07:06:36 +0000 (07:06 +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: I01c47480cba70f7636dbfdbab909996fffb85364

commit | commitdiff | tree

TreeHugger Robot [Fri, 5 Mar 2021 07:06:31 +0000 (07:06 +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: I6e5cb805ec130a322acdcbb5308811dbda6393ed

commit | commitdiff | tree

TreeHugger Robot [Fri, 5 Mar 2021 07:06:24 +0000 (07:06 +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: Id0bd9dbb76470423ce577c44304c6a87d43197eb

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

Chienyuan [Mon, 8 Feb 2021 09:27:17 +0000 (17:27 +0800)]

AVRCP: pass bdaddr by value when use SdpCb

TAG: #security
Bug: 174182139
Test: compilation
Ignore-AOSP-First: security fix
Change-Id: Icd34986b6798e39c9b157588b943f5a883745129
Merged-In: I7f5b2a3dd0540a922b64ce213d871d355bd6dac6

commit | commitdiff | tree

Myles Watson [Thu, 4 Mar 2021 03:27:20 +0000 (03:27 +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: I0f7971698a93b09d635ea9c804c14eb341bcb865

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 22:04:25 +0000 (22:04 +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: I90d0c738c0d2afc39c79b2cf9d964bd10fbe0db7

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 03:03:55 +0000 (03:03 +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: I937b10f34f2d9f982d6f950f09f9840172188ee2

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

Hansong Zhang [Wed, 10 Feb 2021 22:39:33 +0000 (14:39 -0800)]

Check packet size in avrc_pars_browse_rsp

Test: manual
Bug: 179162665
Change-Id: If4d15b3fe907055f3691d03467a3a64dc315fa71
Tag: #security

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:44:26 +0000 (21:44 +0000)]

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d5a4eaf88139a8f42fc2a78103d58200490a0e8

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:46:22 +0000 (19:46 +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: 4789bf9257 -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: I870529f996f6e56b31f9897ff10fff8034ad00d6

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:48:34 +0000 (18:48 +0000)]

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97407380a12cdea95a59df5a3913bb189e34541e

commit | commitdiff | tree

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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63098b126a889297f78733f05842bb8b96ad65d5

commit | commitdiff | tree

Myles Watson [Thu, 7 Jan 2021 18:48:10 +0000 (18:48 +0000)]

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I128905fcaf5c745e9b20caa9112307688e62a7c1

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

system/bt

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.