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

Mauro Rossi [Thu, 26 Dec 2019 20:52:57 +0000 (21:52 +0100)]

hci_packetizer: fix unused building errors

Fixes the following building errors:

system/bt/vendor_libs/linux/interface/hci_packetizer.cc:28:14:
error: unused variable 'preamble_size_for_type' [-Werror,-Wunused-const-variable]
const size_t preamble_size_for_type[] = {
^
system/bt/vendor_libs/linux/interface/hci_packetizer.cc:35:8:
error: unused function 'HciGetPacketLengthForType' [-Werror,-Wunused-function]
size_t HciGetPacketLengthForType(HciPacketType type, const uint8_t* preamble) {
^
2 errors generated.

commit | commitdiff | tree

Chih-Wei Huang [Fri, 24 May 2019 07:01:27 +0000 (15:01 +0800)]

Add back libbt-vendor

commit | commitdiff | tree

Gaganpreet kaur [Wed, 24 Apr 2019 11:09:07 +0000 (16:39 +0530)]

Fix for multiple com.android.bluetooth crash issues.

Issue 1: com.android.bluetooth crash was seen due to invalid/
out of bound index while creating Listening Channel for AVRCP.

Reason: AVRCP creates the listening channel using
bta_av_rc_create, this function expects RC Channel Handle to be
passed as it will fetch the index for RC handle using
tBTA_AV_SCB* p_scb = p_cb->p_scb[shdl - 1];

But we are passing 0 i.e. index for RC handle directly. Due to
which above statement will throw exception for out of bound
index and crash is observed.

Fix: Updated the bta_av_rc_create calls with RC handle value
instead of index.

Issue 2: com.android.bluetooth crash was seen due to failed
check for parameter length for vendor capabilities as:
CHECK(p_vcs_cplt_params->param_len >
BTM_VSC_CHIP_CAPABILITY_RSP_LEN)

Reason: We always receive param_len for vendor capabilities as
9. Also BTM_VSC_CHIP_CAPABILITY_RSP_LEN is defined as 9. But as
per the check param_len is expected to be greater than 9. As the
check fails, exception is seen and crash is observed.

Fix: Changed the CHECK on param_len for Vendor Capabilities as:
CHECK(p_vcs_cplt_params->param_len >=
BTM_VSC_CHIP_CAPABILITY_RSP_LEN)

Change-Id: Ic11c58e8193c0d8252e569fee2bc99d30abb7aae
Tracked-On:
Signed-off-by: Gaganpreet kaur <gaganpreetx.kaur@intel.com>

commit | commitdiff | tree

anitha3x [Tue, 16 Oct 2018 08:52:07 +0000 (14:22 +0530)]

A work around fix for incorrect controller response.

Reason: The controller did not send correct response
for read remote extended features for "page 1" request.
Since lmp extended features ssp was not true, the sm4
was not enabled. Therefore host did not initiate
authentication request. When L2CAP AVDTP connection
was established, the controller returned disconnect
complete with authentication failed reason.

Fix: Provided a retry of read remote extended features
request from host, when response for 'page 1' was
incorrect. This enabled authentication from host and
hence L2CAP AVDTP connection was successful.
Revert the changes, once contoller fix is available

Tracked-On: OAM-69566

Signed-off-by: anitha3x <anithax.h.chandrasekar@intel.com>

commit | commitdiff | tree

Chih-Wei Huang [Tue, 12 Jun 2018 06:32:03 +0000 (14:32 +0800)]

Avoid annoying crashing on VMware

commit | commitdiff | tree

Chih-Wei Huang [Sun, 10 Jun 2018 09:46:25 +0000 (17:46 +0800)]

Remove the unused function

commit | commitdiff | tree

Chih-Wei Huang [Wed, 6 Dec 2017 09:57:21 +0000 (17:57 +0800)]

HCI: don't abort on timeout

Timeout is normal. Especially when the device is suspending.
Don't abort it stupidly.

commit | commitdiff | tree

Android Build Coastguard Worker [Thu, 1 Jul 2021 11:03:48 +0000 (11:03 +0000)]

Merge cherrypicks of [15172584, 15172286, 15172594, 15172385, 15172631, 15172632, 15172633, 15172634, 15171221, 15171222, 15171223, 15171541, 15171542, 15171668, 15172342, 15170823, 15170824, 15170825, 15170826, 15170827, 15170828, 15170829, 15172650, 15172651, 15172652, 15172653, 15172654, 15172655, 15172656, 15172657, 15172658, 15172659, 15172660, 15172661, 15172386, 15172387, 15172388, 15172389, 15172670, 15172553, 15172589, 15172343, 15172617, 15172618, 15172619, 15172620, 15172690, 15172691, 15172692, 15172693, 15172694, 15172695, 15172696, 15172697, 15171708, 15171709, 15172554, 15172555, 15172710, 15172621, 15172635, 15172636, 15172698, 15172699, 15172700, 15171543, 15172701, 15172702, 15172703, 15172704, 15171669, 15172622] into rvc-d2-release

Change-Id: I5398c6b341bc008271401b1e4c7505c54a8b742f

commit | commitdiff | tree

Hansong Zhang [Mon, 7 Jun 2021 18:06:17 +0000 (11:06 -0700)]

SMP: Reject pairing if public_key.x match

Bug: 189329824
Test: POC
Test: pair an LE device
Change-Id: If6d8a72075f0cf657cadfab033cacffeb22868cb
Tag: #security
(cherry picked from commit 9fbf77d1a81b3a1e09d4efa96070a568431e844d)

commit | commitdiff | tree

Richard Smith [Mon, 22 Feb 2021 14:25:43 +0000 (14:25 +0000)]

Fix memory overflow.

Bug: 180939982
Merged-In: I1be3b836e09901c9cc614b02e21ae41b9a1ebfac
Change-Id: I1be3b836e09901c9cc614b02e21ae41b9a1ebfac
(cherry picked from commit 0d93359dbbe99da62528b236ba4a9ab92f06c6af)

commit | commitdiff | tree

android-build-team Robot [Wed, 7 Apr 2021 22:06:29 +0000 (22:06 +0000)]

Snap for 7266183 from ad7f1f6f281585177d2563d66d21325257f35101 to rvc-d2-release

Change-Id: I4eaaceb2e8c473bb95b89455c2148ee8c3f732cf

commit | commitdiff | tree

android-build-team Robot [Tue, 6 Apr 2021 22:06:31 +0000 (22:06 +0000)]

Snap for 7262953 from 0e4254ae237e0cf558f88fa098628ecc355f13cc to rvc-d2-release

Change-Id: Ib21dbf20d5a639a47991313c79f830522323c09f

commit | commitdiff | tree

Chris Manton [Tue, 6 Apr 2021 21:28:40 +0000 (21:28 +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: Id30734b754cef6dc3b487f8750e756ef1bf9c5ff

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

TreeHugger Robot [Fri, 2 Apr 2021 00:53:01 +0000 (00:53 +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: Ie0c31c14363a6fee854770372b0a3c5cd4262cfb

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 03:56:26 +0000 (03:56 +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: I04398790efa50000a05f0b4309684376d95c1443

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

android-build-team Robot [Sat, 6 Mar 2021 22:06:52 +0000 (22:06 +0000)]

Snap for 7189773 from c1a950be8e2d4c6660b40fd7f5e4f8d4e9960cf6 to rvc-d2-release

Change-Id: Ib0dcecd60f661e42d9eabdc8b19e8f60a4cc57af

commit | commitdiff | tree

android-build-team Robot [Sat, 6 Mar 2021 00:06:51 +0000 (00:06 +0000)]

Snap for 7188176 from cf95007900a6c1057c258aa8259f6d0dbbfedd45 to rvc-d2-release

Change-Id: I9e0ddac99cefffe72688a8358a1c40a597aede76

commit | commitdiff | tree

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

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: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

commit | commitdiff | tree

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

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

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

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: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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

android-build-team Robot [Fri, 5 Mar 2021 00:07:14 +0000 (00:07 +0000)]

Snap for 7185379 from 0cce7e32fed41610c2d8c8f7233dd3c7950dea6c to rvc-d2-release

Change-Id: I46f05cecbdd0bc55d40eff527c1ebc91ec05cd69

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 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

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

android-build-team Robot [Thu, 4 Mar 2021 00:07:17 +0000 (00:07 +0000)]

Snap for 7183002 from c4a376463ad3ef2df25f57624edbd5ec4e90d48c to rvc-d2-release

Change-Id: I3098ca062e09ea31bbb1e29cf45976c74da65752

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: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

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: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

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

android-build-team Robot [Thu, 4 Feb 2021 00:02:10 +0000 (00:02 +0000)]

Snap for 7122074 from cb0380b2d99eeb15304df2c676ce7ab4cf04d159 to rvc-d2-release

Change-Id: Ifcc48abe4e600cc2e3d6a22be09a3dde1e260547

commit | commitdiff | tree

Myles Watson [Wed, 3 Feb 2021 21:42:48 +0000 (21:42 +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: I4e0c4d21e0eb5b908484c316f6047a21536b6d27

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

android-build-team Robot [Sat, 16 Jan 2021 00:01:56 +0000 (00:01 +0000)]

Snap for 7085329 from d54225c65408dd535f39a5c55efd7aa5a33eb8c4 to rvc-d2-release

Change-Id: I9546c31ad31a6c8a8a8edb7845e1ee78c3e6eda2

commit | commitdiff | tree

TreeHugger Robot [Fri, 15 Jan 2021 19:45:43 +0000 (19:45 +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: Ib8bfc44fcb80f9c9550342a7e7014445d9c8ae96

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

android-build-team Robot [Fri, 8 Jan 2021 00:03:05 +0000 (00:03 +0000)]

Snap for 7069213 from a71d9b56b010a18273b8a837fa6821d6bcbe1c1e to rvc-d2-release

Change-Id: I85f2273adbe5d4ec884c3b84266c4ac85e47918a

commit | commitdiff | tree

TreeHugger Robot [Thu, 7 Jan 2021 19:19:40 +0000 (19:19 +0000)]

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c0447000ad79c98a2a0aef26f20619b01b7e823

commit | commitdiff | tree

TreeHugger Robot [Thu, 7 Jan 2021 19:19:32 +0000 (19:19 +0000)]

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I564203f08338f86bbec986ec2726c6c337bffc98

commit | commitdiff | tree

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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2a1e0853ff1014f2b71d2c6c96268e3b04f6103

commit | commitdiff | tree

TreeHugger Robot [Thu, 7 Jan 2021 18:47:45 +0000 (18:47 +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: I30e9a03001032357a389b0311324e34b8820080a

commit | commitdiff | tree

TreeHugger Robot [Thu, 7 Jan 2021 18:47:39 +0000 (18:47 +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: Ib18cc6740792d7a05a5874fb7adda82d2e90bb17

commit | commitdiff | tree

Myles Watson [Thu, 7 Jan 2021 18:47:25 +0000 (18:47 +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: I48cf9424a0250fda95931a1d8d46a2fd4f40dfc0

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

system/bt

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.