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

Chen Chen [Tue, 6 Oct 2020 20:53:43 +0000 (20:53 +0000)]

Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0ae0ef9 am: 7337996317

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

Change-Id: Iaa69ebded8be2055cb9fee48d2d0b2e3ec8365cf

commit | commitdiff | tree

Chen Chen [Tue, 6 Oct 2020 20:16:04 +0000 (20:16 +0000)]

Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0ae0ef9

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

Change-Id: I7d010b57ab226b166d9895d95101056b2f305d31

commit | commitdiff | tree

Chen Chen [Tue, 6 Oct 2020 19:57:19 +0000 (19:57 +0000)]

Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87

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

Change-Id: I1391cb656ed035aaec7beb0f2c11e5b3c008f4cc

commit | commitdiff | tree

Chen Chen [Tue, 6 Oct 2020 18:52:36 +0000 (18:52 +0000)]

Check Classic key before cross-key derivation am: 814160abca

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

Change-Id: I10b980c9f480dd9e2f2adb5af47cb23ff99421e6

commit | commitdiff | tree

Chen Chen [Thu, 24 Sep 2020 00:02:58 +0000 (17:02 -0700)]

Check Classic key before cross-key derivation

Bug: 158854097
Test: atest net_test_stack_smp
Tag: #security
Ignore-AOSP-First: Security fix
Exempt-From-Owner-Approval: Already got owner approval,
but somehow it still shows no owner vote

Change-Id: Id88241324e9fb89ef14e50b52eb459a0d81c492b

commit | commitdiff | tree

Chen Chen [Tue, 6 Oct 2020 03:59:41 +0000 (03:59 +0000)]

Check Classic key before cross-key derivation am: 992e25e6b9 am: eec1a1e896

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

Change-Id: Icfc2e05b44e48cc1ee6dd4594877a85195ea15f0

commit | commitdiff | tree

Chen Chen [Tue, 6 Oct 2020 03:59:33 +0000 (03:59 +0000)]

Check Classic key before cross-key derivation am: da8aa68903

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

Change-Id: I85a19b10f4f7ac9ec94811d022ed28b2e9a2b848

commit | commitdiff | tree

Chen Chen [Tue, 6 Oct 2020 03:59:17 +0000 (03:59 +0000)]

Check Classic key before cross-key derivation am: 992e25e6b9

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

Change-Id: I7bad5de1a8d79930b54c7075405b75ee466fc3fa

commit | commitdiff | tree

Chen Chen [Thu, 24 Sep 2020 00:02:58 +0000 (17:02 -0700)]

Check Classic key before cross-key derivation

Bug: 158854097
Test: atest net_test_stack_smp
Tag: #security
Ignore-AOSP-First: Security fix

Change-Id: Id88241324e9fb89ef14e50b52eb459a0d81c492b

commit | commitdiff | tree

Chen Chen [Thu, 24 Sep 2020 00:02:58 +0000 (17:02 -0700)]

Check Classic key before cross-key derivation

Bug: 158854097
Test: atest net_test_stack_smp
Tag: #security
Ignore-AOSP-First: Security fix

Change-Id: Id88241324e9fb89ef14e50b52eb459a0d81c492b

commit | commitdiff | tree

Chen Chen [Thu, 24 Sep 2020 00:02:58 +0000 (17:02 -0700)]

Check Classic key before cross-key derivation

Bug: 158854097
Test: atest net_test_stack_smp
Tag: #security
Ignore-AOSP-First: Security fix

Change-Id: Id88241324e9fb89ef14e50b52eb459a0d81c492b

commit | commitdiff | tree

TreeHugger Robot [Mon, 31 Aug 2020 18:02:24 +0000 (18:02 +0000)]

[automerger skipped] Merge "Send a response to an smp security request depending on the callback event" into oc-dev am: 9f1c709363 am: 28de519df5 -s ours am: 9361f12bad -s ours am: dd0f5d9ae0 -s ours

am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1 1570e8de12 is in history

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

Change-Id: Ia2c0620d025a91e2ba4cf0cd4acd5326d71c8522

commit | commitdiff | tree

li-wei.cheng [Mon, 31 Aug 2020 18:02:16 +0000 (18:02 +0000)]

[automerger skipped] Return after removing sample LTK device am: c6879c3fe5 am: bf69312868 am: 74ebab6814 -s ours am: 1f118853c5 -s ours

am skip reason: Change-Id Iaa59f3c415dd8066849fd70912fdb83f890229d7 with SHA-1 7c86810c44 is in history

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

Change-Id: I075047a75067503e98c3d2251b03cad2e5a6fefc

commit | commitdiff | tree

Jakub Pawlowski [Mon, 31 Aug 2020 18:02:07 +0000 (18:02 +0000)]

[automerger skipped] Don't persist bonds using sample LTK am: 70411f0877 -s ours am: f79ba4c65d am: 1c00e23d9f

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

Change-Id: I2b6213a807eedaa840a15813efed81ed17d81e6d

commit | commitdiff | tree

TreeHugger Robot [Mon, 31 Aug 2020 17:18:27 +0000 (17:18 +0000)]

[automerger skipped] Merge "Send a response to an smp security request depending on the callback event" into oc-dev am: 9f1c709363 am: 28de519df5 -s ours am: 9361f12bad -s ours

am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1 1570e8de12 is in history

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

Change-Id: I2fb43fe52f2214df67e87dc27ea95ba4f2d4c7fb

commit | commitdiff | tree

li-wei.cheng [Mon, 31 Aug 2020 17:18:20 +0000 (17:18 +0000)]

[automerger skipped] Return after removing sample LTK device am: c6879c3fe5 am: bf69312868 am: 74ebab6814 -s ours

am skip reason: Change-Id Iaa59f3c415dd8066849fd70912fdb83f890229d7 with SHA-1 7c86810c44 is in history

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

Change-Id: I18dee0776a1cfec33193598750f27767e451b054

commit | commitdiff | tree

Jakub Pawlowski [Mon, 31 Aug 2020 17:18:10 +0000 (17:18 +0000)]

[automerger skipped] Don't persist bonds using sample LTK am: 70411f0877 -s ours am: f79ba4c65d

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

Change-Id: I7382773a19a2b7b098f9ce1bdb5364723dafa546

commit | commitdiff | tree

TreeHugger Robot [Mon, 31 Aug 2020 17:12:27 +0000 (17:12 +0000)]

[automerger skipped] Merge "Send a response to an smp security request depending on the callback event" into oc-dev am: 9f1c709363 am: 28de519df5 -s ours

am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1 1570e8de12 is in history

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

Change-Id: I97233565f3adeb025a2924e52a7f15353628bae7

commit | commitdiff | tree

li-wei.cheng [Mon, 31 Aug 2020 17:12:16 +0000 (17:12 +0000)]

Return after removing sample LTK device am: c6879c3fe5 am: bf69312868

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

Change-Id: I16cf93538d6d706acd22876712fa615dd820d12e

commit | commitdiff | tree

TreeHugger Robot [Mon, 31 Aug 2020 17:04:23 +0000 (17:04 +0000)]

Merge "Send a response to an smp security request depending on the callback event" into oc-dev am: 9f1c709363

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

Change-Id: I8857f2e8f4e7eee007bb1d1597b587a1965ca882

commit | commitdiff | tree

li-wei.cheng [Mon, 31 Aug 2020 17:04:06 +0000 (17:04 +0000)]

Return after removing sample LTK device am: c6879c3fe5

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

Change-Id: I7bb17e11a74ed992191cd446408ee7bef4b984de

commit | commitdiff | tree

Jakub Pawlowski [Mon, 31 Aug 2020 17:03:56 +0000 (17:03 +0000)]

[automerger skipped] Don't persist bonds using sample LTK am: 70411f0877 -s ours

am skip reason: skipped by user mylesgw

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

Change-Id: Ia4bdeb2996c3bf7d7982f60a360b3790e542397d

commit | commitdiff | tree

Jakub Pawlowski [Mon, 11 Mar 2019 18:22:01 +0000 (19:22 +0100)]

Don't persist bonds using sample LTK

Test: compilation, manual testing
Bug: 128843052
Bug: 162497143
Merged-In: I52fd484d42bf87e96dbc9e6456090f231ed48111
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111
(cherry picked from commit 292fcf8612f488a2fcbf99614caba46ead076eb2)

commit | commitdiff | tree

Rahul Sabnis [Fri, 28 Aug 2020 21:47:20 +0000 (21:47 +0000)]

[automerger skipped] Send a response to an smp security request depending on the callback event am: 1570e8de12 -s ours am: 184ce57aa4 -s ours

am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1 c3894d6360 is in history

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

Change-Id: I523d2a6ae2651c6f975fd84178c457525269c605

commit | commitdiff | tree

TreeHugger Robot [Fri, 28 Aug 2020 21:47:11 +0000 (21:47 +0000)]

[automerger skipped] Merge "Send a response to an smp security request depending on the callback event" into pi-dev am: 9b8d6f75f1 -s ours

am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1 e45cec1547 is in history

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

Change-Id: Id26dace44f06b48fe704f6bc4a507863f5785df9

commit | commitdiff | tree

Rahul Sabnis [Fri, 28 Aug 2020 21:46:27 +0000 (21:46 +0000)]

[automerger skipped] Send a response to an smp security request depending on the callback event am: 1570e8de12 -s ours

am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1 c3894d6360 is in history

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

Change-Id: Ic9a3092bcbdcadf8aeb3f9a1c4ebfb5a23d7c89f

commit | commitdiff | tree

TreeHugger Robot [Fri, 28 Aug 2020 21:35:22 +0000 (21:35 +0000)]

Merge "Send a response to an smp security request depending on the callback event" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 28 Aug 2020 21:34:51 +0000 (21:34 +0000)]

Merge "Send a response to an smp security request depending on the callback event" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 28 Aug 2020 21:34:08 +0000 (21:34 +0000)]

Merge "Send a response to an smp security request depending on the callback event" into qt-dev

commit | commitdiff | tree

li-wei.cheng [Fri, 28 Aug 2020 18:16:23 +0000 (18:16 +0000)]

Return after removing sample LTK device am: 7c86810c44

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

Change-Id: I25110f82609f6cfaa27163f75f21ea46b8edb780

commit | commitdiff | tree

Rahul Sabnis [Mon, 24 Aug 2020 23:36:36 +0000 (16:36 -0700)]

Send a response to an smp security request depending on the callback event

Tag: #feature
Bug: 157038281
Test: Manual
Merged-In: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351
Change-Id: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351

commit | commitdiff | tree

Rahul Sabnis [Mon, 24 Aug 2020 23:36:36 +0000 (16:36 -0700)]

Send a response to an smp security request depending on the callback event

Tag: #feature
Bug: 157038281
Test: Manual
Merged-In: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351
Change-Id: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351

commit | commitdiff | tree

Rahul Sabnis [Mon, 24 Aug 2020 23:36:36 +0000 (16:36 -0700)]

Send a response to an smp security request depending on the callback event

Tag: #feature
Bug: 157038281
Test: Manual
Merged-In: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351
Change-Id: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351

commit | commitdiff | tree

Rahul Sabnis [Mon, 24 Aug 2020 23:36:36 +0000 (16:36 -0700)]

Send a response to an smp security request depending on the callback event

Tag: #feature
Bug: 157038281
Test: Manual
Merged-In: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351
Change-Id: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351

commit | commitdiff | tree

li-wei.cheng [Mon, 20 Jan 2020 07:27:21 +0000 (15:27 +0800)]

Return after removing sample LTK device

Return directly after calling bta_dm_remove_device to
prevent from accessing the invalid security record (p_dev_rec).

Test: Hardcode to test bond with sample key
Tag: #security
Bug: 162497143
Change-Id: Iaa59f3c415dd8066849fd70912fdb83f890229d7
Merged-In: Iaa59f3c415dd8066849fd70912fdb83f890229d7

commit | commitdiff | tree

li-wei.cheng [Mon, 20 Jan 2020 07:27:21 +0000 (15:27 +0800)]

Return after removing sample LTK device

Return directly after calling bta_dm_remove_device to
prevent from accessing the invalid security record (p_dev_rec).

Test: Hardcode to test bond with sample key
Tag: #security
Bug: 162497143
Change-Id: Iaa59f3c415dd8066849fd70912fdb83f890229d7

commit | commitdiff | tree

Rahul Sabnis [Wed, 5 Aug 2020 22:14:51 +0000 (22:14 +0000)]

[automerger skipped] Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-dev am: b2adda8177 am: 00fd683aec -s ours am: 14ae20b072 -s ours am: 1f504a4d1c -s ours

am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1 0b4c1014f7 is in history

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

Change-Id: I84b756a054c2e0ef864b575b6cc9ef3226e63985

commit | commitdiff | tree

Rahul Sabnis [Wed, 5 Aug 2020 21:53:28 +0000 (21:53 +0000)]

[automerger skipped] Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-dev am: b2adda8177 am: 00fd683aec -s ours am: 14ae20b072 -s ours

am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1 0b4c1014f7 is in history

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

Change-Id: I345e6523f88819ffd331090c3d1671cd480641c6

commit | commitdiff | tree

Rahul Sabnis [Wed, 5 Aug 2020 21:37:24 +0000 (21:37 +0000)]

[automerger skipped] Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-mr1-dev am: 4256337c9e -s ours am: d24757a4f0 -s ours

am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1 ad8fba09ac is in history

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

Change-Id: Ib832a24dc121abf2c7e7769aae7cbe88f5d724a1

commit | commitdiff | tree

Rahul Sabnis [Wed, 5 Aug 2020 21:35:45 +0000 (21:35 +0000)]

[automerger skipped] Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-dev am: b2adda8177 am: 00fd683aec -s ours

am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1 0b4c1014f7 is in history

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

Change-Id: I64045645e5b0c45d25f239f52070f796e8162077

commit | commitdiff | tree

Rahul Sabnis [Wed, 5 Aug 2020 21:18:10 +0000 (21:18 +0000)]

Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-dev am: b2adda8177

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

Change-Id: I3cc71adac1897fb29ce5fb4012ed8b1567f1e614

commit | commitdiff | tree

Rahul Sabnis [Wed, 5 Aug 2020 21:17:00 +0000 (21:17 +0000)]

[automerger skipped] Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-mr1-dev am: 4256337c9e -s ours

am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1 ad8fba09ac is in history

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

Change-Id: Icdcade676ae8c5cf2b05f42ce92611c97afd2b68

commit | commitdiff | tree

Rahul Sabnis [Wed, 5 Aug 2020 20:56:23 +0000 (20:56 +0000)]

Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-dev

commit | commitdiff | tree

Rahul Sabnis [Wed, 5 Aug 2020 20:51:45 +0000 (20:51 +0000)]

Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 5 Aug 2020 19:12:58 +0000 (19:12 +0000)]

[automerger skipped] Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into pi-dev am: 2b178f7896 -s ours

am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1 cd3398b4e2 is in history

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

Change-Id: I8984a13c5abda90c0820798e8433e2cd8efb5f7a

commit | commitdiff | tree

TreeHugger Robot [Wed, 5 Aug 2020 18:56:04 +0000 (18:56 +0000)]

Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 5 Aug 2020 18:53:45 +0000 (18:53 +0000)]

Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into qt-dev

commit | commitdiff | tree

weichinweng [Wed, 5 Aug 2020 12:51:04 +0000 (12:51 +0000)]

[automerger skipped] Fix possible OOB when receive gatt read type response data am: 342cb328b6 am: 6d86ead0e3 -s ours am: 4e8d3b8eba -s ours am: f89ac96265 -s ours

am skip reason: Change-Id I1bd8713eecebc2bc3d919402b035987e06a2d4d3 with SHA-1 0eb7a763df is in history

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

Change-Id: Ia53860c6cea74a32279587c1a74d9bf6ed430280

commit | commitdiff | tree

weichinweng [Wed, 5 Aug 2020 12:32:35 +0000 (12:32 +0000)]

[automerger skipped] Fix possible OOB when receive gatt read type response data am: 342cb328b6 am: 6d86ead0e3 -s ours am: 4e8d3b8eba -s ours

am skip reason: Change-Id I1bd8713eecebc2bc3d919402b035987e06a2d4d3 with SHA-1 0eb7a763df is in history

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

Change-Id: Ia454d830d9e5e11883b83de17461b88d1c3d6a89

commit | commitdiff | tree

weichinweng [Wed, 5 Aug 2020 12:13:40 +0000 (12:13 +0000)]

[automerger skipped] Fix possible OOB when receive gatt read type response data am: 342cb328b6 am: 6d86ead0e3 -s ours

am skip reason: Change-Id I1bd8713eecebc2bc3d919402b035987e06a2d4d3 with SHA-1 0eb7a763df is in history

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

Change-Id: I0e10ba38b8aa463e7524ca0da1c2aa8ce5c86b5b

commit | commitdiff | tree

weichinweng [Wed, 5 Aug 2020 11:59:47 +0000 (11:59 +0000)]

Fix possible OOB when receive gatt read type response data am: 342cb328b6

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

Change-Id: I064b5c88b2734129a9f1811f372713b01938ad9c

commit | commitdiff | tree

weichinweng [Wed, 5 Aug 2020 08:49:07 +0000 (08:49 +0000)]

Fix possible OOB when receive gatt read type response data am: 0eb7a763df am: 2cce69804f

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

Change-Id: Icee5cfa0941b171ce3d03ec2f7709e2ed3c36645

commit | commitdiff | tree

weichinweng [Wed, 5 Aug 2020 08:26:01 +0000 (08:26 +0000)]

Fix possible OOB when receive gatt read type response data am: 0eb7a763df

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

Change-Id: I941c06817ca42034d8cc6e74aae49cf4fc1e4dbc

commit | commitdiff | tree

weichinweng [Tue, 28 Jul 2020 08:56:33 +0000 (16:56 +0800)]

Fix possible OOB when receive gatt read type response data

Bug: 158833854
Bug: 158778659
Test: manual
Tag: #security

Change-Id: I1bd8713eecebc2bc3d919402b035987e06a2d4d3
Merged-In: I1bd8713eecebc2bc3d919402b035987e06a2d4d3

commit | commitdiff | tree

Rahul Sabnis [Sat, 1 Aug 2020 02:44:27 +0000 (19:44 -0700)]

Check whether local device is an ATV device to determine whether to show
the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode

Tag: #feature
Bug: 157038281
Test: Manual
Merged-In: I6d06f5996da71e5a1407e544b0023d82924aa56f
Change-Id: I6d06f5996da71e5a1407e544b0023d82924aa56f

commit | commitdiff | tree

Rahul Sabnis [Sat, 1 Aug 2020 02:44:27 +0000 (19:44 -0700)]

Check whether local device is an ATV device to determine whether to show
the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode

Tag: #feature
Bug: 157038281
Test: Manual
Merged-In: I6d06f5996da71e5a1407e544b0023d82924aa56f
Change-Id: I6d06f5996da71e5a1407e544b0023d82924aa56f

commit | commitdiff | tree

Rahul Sabnis [Sat, 1 Aug 2020 02:44:27 +0000 (19:44 -0700)]

Check whether local device is an ATV device to determine whether to show
the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode

Tag: #feature
Bug: 157038281
Test: Manual
Merged-In: I6d06f5996da71e5a1407e544b0023d82924aa56f
Change-Id: I6d06f5996da71e5a1407e544b0023d82924aa56f

commit | commitdiff | tree

Rahul Sabnis [Sat, 1 Aug 2020 02:44:27 +0000 (19:44 -0700)]

Check whether local device is an ATV device to determine whether to show
the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode

Tag: #feature
Bug: 157038281
Test: Manual
Merged-In: I6d06f5996da71e5a1407e544b0023d82924aa56f
Change-Id: I6d06f5996da71e5a1407e544b0023d82924aa56f

commit | commitdiff | tree

weichinweng [Tue, 28 Jul 2020 08:56:33 +0000 (16:56 +0800)]

Fix possible OOB when receive gatt read type response data

Bug: 158833854
Bug: 158778659
Test: manual
Tag: #security

Change-Id: I1bd8713eecebc2bc3d919402b035987e06a2d4d3

commit | commitdiff | tree

Rahul Sabnis [Fri, 31 Jul 2020 01:28:31 +0000 (01:28 +0000)]

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: 57ffe1ba12 am: 70e77e9a2f -s ours am: 459630e366 -s ours am: 5830285595 -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 b5c0bfc132 is in history

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

Change-Id: I63dd8398d5a268766d7a8f71acfd0597893e18ba

commit | commitdiff | tree

Rahul Sabnis [Fri, 31 Jul 2020 01:09:09 +0000 (01:09 +0000)]

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: 57ffe1ba12 am: 70e77e9a2f -s ours am: 459630e366 -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 b5c0bfc132 is in history

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

Change-Id: I7e5b93e63eadbda49fc9ff28a6308a72e99b6ef0

commit | commitdiff | tree

Rahul Sabnis [Fri, 31 Jul 2020 00:51:00 +0000 (00:51 +0000)]

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: 57ffe1ba12 am: 70e77e9a2f -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 b5c0bfc132 is in history

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

Change-Id: I5ad01f31ae5ad09d350a04ff3414ae516ad0077d

commit | commitdiff | tree

Rahul Sabnis [Fri, 31 Jul 2020 00:27:46 +0000 (00:27 +0000)]

Shows a consent dialog on the local device when pairing a bluetooth low am: 57ffe1ba12

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

Change-Id: I591af4f49890b67d9d110747984e1061aeaa9a57

commit | commitdiff | tree

Rahul Sabnis [Fri, 31 Jul 2020 00:14:27 +0000 (00:14 +0000)]

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: b5c0bfc132 -s ours am: e66f27327b -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 8709264b5c is in history

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

Change-Id: Iaec291391db339a109db382c530918bc4090357f

commit | commitdiff | tree

Rahul Sabnis [Fri, 31 Jul 2020 00:13:49 +0000 (00:13 +0000)]

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: 8709264b5c -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 b6bcc43c7b is in history

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

Change-Id: If96604b3f5b0843bae5ea46c4806a46af523cf26

commit | commitdiff | tree

Rahul Sabnis [Fri, 31 Jul 2020 00:11:56 +0000 (00:11 +0000)]

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: b5c0bfc132 -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 8709264b5c is in history

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

Change-Id: Ibf60879048f2eea001a0b5c3cf4f9a4fcdb3edd6

commit | commitdiff | tree

Rahul Sabnis [Fri, 26 Jun 2020 17:27:07 +0000 (10:27 -0700)]

Shows a consent dialog on the local device when pairing a bluetooth low
energy device if the local device has a display.

Tag: #security
Bug: 157038281
Test: Manual
Merged-In: I7de396230beb84bd0fa2b0cea346523b6824472a
Change-Id: I7de396230beb84bd0fa2b0cea346523b6824472a

commit | commitdiff | tree

Rahul Sabnis [Fri, 26 Jun 2020 17:27:07 +0000 (10:27 -0700)]

Shows a consent dialog on the local device when pairing a bluetooth low
energy device if the local device has a display.

Tag: #security
Bug: 157038281
Test: Manual
Merged-In: I7de396230beb84bd0fa2b0cea346523b6824472a
Change-Id: I7de396230beb84bd0fa2b0cea346523b6824472a

commit | commitdiff | tree

Rahul Sabnis [Fri, 26 Jun 2020 17:27:07 +0000 (10:27 -0700)]

Shows a consent dialog on the local device when pairing a bluetooth low
energy device if the local device has a display.

Tag: #security
Bug: 157038281
Test: Manual
Merged-In: I7de396230beb84bd0fa2b0cea346523b6824472a
Change-Id: I7de396230beb84bd0fa2b0cea346523b6824472a

commit | commitdiff | tree

Rahul Sabnis [Fri, 26 Jun 2020 17:27:07 +0000 (10:27 -0700)]

Shows a consent dialog on the local device when pairing a bluetooth low
energy device if the local device has a display.

Tag: #security
Bug: 157038281
Test: Manual
Merged-In: I7de396230beb84bd0fa2b0cea346523b6824472a
Change-Id: I7de396230beb84bd0fa2b0cea346523b6824472a

commit | commitdiff | tree

Joseph Pirozzo [Fri, 26 Jun 2020 13:42:17 +0000 (13:42 +0000)]

Merge "Enable bitpool sanity checks" into oc-dev am: 15ccbf59de am: b7bd79e254 am: e7c4690a6b am: 6c9602b148

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

Change-Id: Ie5a818b066a2d2d4401cbe22d399fd75a97a4f5b

commit | commitdiff | tree

Joseph Pirozzo [Fri, 26 Jun 2020 13:29:50 +0000 (13:29 +0000)]

Merge "Enable bitpool sanity checks" into oc-dev am: 15ccbf59de am: b7bd79e254 am: e7c4690a6b

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

Change-Id: Id273f7a0dcccdd41a0cc5f7dc9c782477aaf046b

commit | commitdiff | tree

Joseph Pirozzo [Fri, 26 Jun 2020 13:13:54 +0000 (13:13 +0000)]

Merge "Enable bitpool sanity checks" into oc-dev am: 15ccbf59de am: b7bd79e254

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

Change-Id: I1f53339a2b08ec342d65fe45f6a69965b87edf4a

commit | commitdiff | tree

Joseph Pirozzo [Fri, 26 Jun 2020 13:01:21 +0000 (13:01 +0000)]

Merge "Enable bitpool sanity checks" into oc-dev am: 15ccbf59de

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

Change-Id: I53a4ce34dba71b7715f791a03b6128458f8bc7e8

commit | commitdiff | tree

Joseph Pirozzo [Fri, 26 Jun 2020 12:40:58 +0000 (12:40 +0000)]

Merge "Enable bitpool sanity checks" into oc-dev

commit | commitdiff | tree

Myles Watson [Thu, 25 Jun 2020 22:05:37 +0000 (22:05 +0000)]

[automerger skipped] DO NOT MERGE: Remove pairing on incoming bond request am: 85b5df1d0d am: ab50a6b284 -s ours am: 14b17d2fb1 -s ours am: db513f6c97 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id0a0e93bcdc38a92212eed4e41d09db6ed6ab37f

commit | commitdiff | tree

Myles Watson [Thu, 25 Jun 2020 21:45:08 +0000 (21:45 +0000)]

[automerger skipped] DO NOT MERGE: Remove pairing on incoming bond request am: 85b5df1d0d am: ab50a6b284 -s ours am: 14b17d2fb1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ide10d75b623cdb0bc7047529ce0c79e57a18120f

commit | commitdiff | tree

Myles Watson [Thu, 25 Jun 2020 21:28:30 +0000 (21:28 +0000)]

[automerger skipped] DO NOT MERGE: Remove pairing on incoming bond request am: 85b5df1d0d am: ab50a6b284 -s ours

am skip reason: Change-Id I048b7b142e3fe2096cf1a9aa2931c175fa52cd45 with SHA-1 e29c52cfda is in history

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

Change-Id: I01231f49767b1f5e54f43bf119e410a147198033

commit | commitdiff | tree

Myles Watson [Thu, 25 Jun 2020 21:15:23 +0000 (21:15 +0000)]

DO NOT MERGE: Remove pairing on incoming bond request am: 85b5df1d0d

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

Change-Id: Icf0c4b744a56a06669fea1effd45c898063a4631

commit | commitdiff | tree

Myles Watson [Thu, 25 Jun 2020 20:27:15 +0000 (20:27 +0000)]

[automerger skipped] DO NOT MERGE: Remove pairing on incoming bond request am: e29c52cfda -s ours am: 594c470d27 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I57e23a03647c13e6ffbb2e42b016e2fbb20c516f

commit | commitdiff | tree

Myles Watson [Thu, 25 Jun 2020 20:03:22 +0000 (20:03 +0000)]

[automerger skipped] DO NOT MERGE: Remove pairing on incoming bond request am: e29c52cfda -s ours

am skip reason: subject contains skip directive

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

Change-Id: I289b55466f022e0ee4422a142427014146eeb936

commit | commitdiff | tree

Myles Watson [Thu, 25 Jun 2020 19:38:38 +0000 (19:38 +0000)]

Remove pairing on incoming bond request am: 21e580de3b

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

Change-Id: I8eab6881fc28cd96fc7c7975d4ffb4bf75626eb2

commit | commitdiff | tree

Myles Watson [Thu, 18 Jun 2020 21:35:53 +0000 (14:35 -0700)]

DO NOT MERGE: Remove pairing on incoming bond request

Bug: 150156492
Tag: #security
Test: Bond two devices, forget from one device and reconnect
Change-Id: I048b7b142e3fe2096cf1a9aa2931c175fa52cd45
(cherry picked from commit 13f409ad3a2423b06af7a7f1a9b06fb06c8820a7)
Merged-In: I048b7b142e3fe2096cf1a9aa2931c175fa52cd45

commit | commitdiff | tree

Myles Watson [Thu, 18 Jun 2020 21:35:53 +0000 (14:35 -0700)]

DO NOT MERGE: Remove pairing on incoming bond request

Bug: 150156492
Tag: #security
Test: Bond two devices, forget from one device and reconnect
Change-Id: I048b7b142e3fe2096cf1a9aa2931c175fa52cd45
(cherry picked from commit 13f409ad3a2423b06af7a7f1a9b06fb06c8820a7)
Merged-In: I048b7b142e3fe2096cf1a9aa2931c175fa52cd45

commit | commitdiff | tree

Myles Watson [Thu, 18 Jun 2020 21:35:53 +0000 (14:35 -0700)]

Remove pairing on incoming bond request

Bug: 150156492
Tag: #security
Test: Bond two devices, forget from one device and reconnect
Change-Id: I048b7b142e3fe2096cf1a9aa2931c175fa52cd45
Merged-In: I048b7b142e3fe2096cf1a9aa2931c175fa52cd45
(cherry picked from commit 13f409ad3a2423b06af7a7f1a9b06fb06c8820a7)

commit | commitdiff | tree

Joseph Pirozzo [Mon, 25 May 2020 17:36:26 +0000 (10:36 -0700)]

Enable bitpool sanity checks

Enable bitpool sanity checks to run all the time, not just in debug
mode.

Tag: #security
Test: sbcdecoder_fuzzer
Bug: 146398979
Change-Id: Iff58305cd18de35e37290f0c09fba01ee14e787a

commit | commitdiff | tree

Sterling Huber [Wed, 8 Apr 2020 00:13:33 +0000 (00:13 +0000)]

Merge "Check a2dp packet length is zero" into qt-dev

commit | commitdiff | tree

Jakub Pawlowski [Tue, 7 Apr 2020 23:38:36 +0000 (23:38 +0000)]

[automerger skipped] Fix potential stack overflow caused by integer overflow am: 1570b62c88 am: 5b4bf745e9 am: 6360e91bb3 am: 3cd74938d8 -s ours

am skip reason: Change-Id I0655b0b62301f78cd8705cc7b0e4fc11522f00ca with SHA-1 ec0d507ed2 is in history

Change-Id: Ife4a1d737088dbf51ac29f0a6411d9468b456593

commit | commitdiff | tree

Jakub Pawlowski [Tue, 7 Apr 2020 23:24:21 +0000 (23:24 +0000)]

Fix potential stack overflow caused by integer overflow am: 1570b62c88 am: 5b4bf745e9 am: 6360e91bb3

Change-Id: I1e23e75fd05e41b9cd31bb93b945135bef21c04f

commit | commitdiff | tree

Jakub Pawlowski [Tue, 7 Apr 2020 23:09:11 +0000 (23:09 +0000)]

Fix potential stack overflow caused by integer overflow am: 1570b62c88 am: 5b4bf745e9

Change-Id: I91417fff40a89042993a9fcbfaa6b7f45c162d89

commit | commitdiff | tree

Jakub Pawlowski [Tue, 7 Apr 2020 22:51:21 +0000 (22:51 +0000)]

Fix potential stack overflow caused by integer overflow am: 1570b62c88

Change-Id: Iaf75d5b63297d50e3115422f15fa8511133ef45a

commit | commitdiff | tree

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

Check a2dp packet length is zero

Bug: 142546668
Test: net_test_stack_a2dp_native

Change-Id: I105b445293c02cb4f37c759fd5b05758fd4e3646
Merged-In: I105b445293c02cb4f37c759fd5b05758fd4e3646

commit | commitdiff | tree

Jakub Pawlowski [Fri, 20 Mar 2020 14:24:00 +0000 (15:24 +0100)]

Fix potential stack overflow caused by integer overflow

Bug: 151155194
Merged-In: I0655b0b62301f78cd8705cc7b0e4fc11522f00ca
Change-Id: I0655b0b62301f78cd8705cc7b0e4fc11522f00ca

commit | commitdiff | tree

Jakub Pawlowski [Mon, 16 Mar 2020 11:09:15 +0000 (12:09 +0100)]

Fix potential stack overflow caused by integer overflow

Bug: 151155194
Merged-In: I0655b0b62301f78cd8705cc7b0e4fc11522f00ca
Change-Id: I0655b0b62301f78cd8705cc7b0e4fc11522f00ca

commit | commitdiff | tree

Automerger Merge Worker [Wed, 11 Mar 2020 00:26:11 +0000 (00:26 +0000)]

[automerger skipped] GattServcer: Check invalid offset am: 30a2860ed1 am: 2865a273f2 -s ours am: b9e373e364 -s ours am: 78003bf5ef -s ours

am skip reason: Change-Id I0396380f431cdb7f91c78db6de9043ea0f373dfe with SHA-1 c14c1fb864 is in history

Change-Id: I9583370dee55f32ebda4a009c1a9a2b5586b1c95

commit | commitdiff | tree

Automerger Merge Worker [Wed, 11 Mar 2020 00:14:09 +0000 (00:14 +0000)]

[automerger skipped] GattServcer: Check invalid offset am: 30a2860ed1 am: 2865a273f2 -s ours am: b9e373e364 -s ours

am skip reason: Change-Id I0396380f431cdb7f91c78db6de9043ea0f373dfe with SHA-1 c14c1fb864 is in history

Change-Id: I19ce865f59ffe8bee30c81401a480d1b32ee632b

commit | commitdiff | tree

Automerger Merge Worker [Tue, 10 Mar 2020 23:58:30 +0000 (23:58 +0000)]

[automerger skipped] GattServcer: Check invalid offset am: 30a2860ed1 am: 2865a273f2 -s ours

am skip reason: Change-Id I0396380f431cdb7f91c78db6de9043ea0f373dfe with SHA-1 c14c1fb864 is in history

Change-Id: Iba77996d7a5acdbee2865868d506634620ccf793

commit | commitdiff | tree

Automerger Merge Worker [Tue, 10 Mar 2020 23:42:03 +0000 (23:42 +0000)]

GattServcer: Check invalid offset am: 30a2860ed1

Change-Id: I1d3aae196fb82155b88e2377e96670797f228f8a

commit | commitdiff | tree

Automerger Merge Worker [Tue, 10 Mar 2020 21:22:16 +0000 (21:22 +0000)]

[automerger skipped] GattServcer: Check invalid offset am: c14c1fb864 -s ours am: e3b33dec09 -s ours

am skip reason: Change-Id I97e2c3ae15fccc482d07d8d621c455cc74900cfd with SHA-1 7674de8fc8 is in history

Change-Id: Id5714e151ff13706e496b71898712b9410be7746

commit | commitdiff | tree

Hansong Zhang [Thu, 13 Feb 2020 19:40:44 +0000 (11:40 -0800)]

GattServcer: Check invalid offset

Test: manual
Bug: 143231677
Merged-In: I0396380f431cdb7f91c78db6de9043ea0f373dfe
Merged-In: I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8
Change-Id: I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8

system/bt

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.