OSDN Git Service
TreeHugger Robot [Mon, 31 Aug 2020 18:19:19 +0000 (18:19 +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:
69733ee790 -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: I9f0c34b2921f62ab21320d59b8c72a28da4985f3
li-wei.cheng [Mon, 31 Aug 2020 18:19:13 +0000 (18:19 +0000)]
[automerger skipped] Return after removing sample LTK device am:
c6879c3fe5 am:
bf69312868 am:
74ebab6814 -s ours am:
1f118853c5 -s ours am:
084f56e0af -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: Ie7fc64be134a82ee481383d10825ec2c5faf40ab
Jakub Pawlowski [Mon, 31 Aug 2020 18:19:02 +0000 (18:19 +0000)]
[automerger skipped] Don't persist bonds using sample LTK am:
70411f0877 -s ours am:
f79ba4c65d am:
1c00e23d9f am:
e55b86fb06
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12484285
Change-Id: I3a2dc1de7d57b588a0f5ed3dd935f0cce2510150
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
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
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
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
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
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
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
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
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
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
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
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)
Rahul Sabnis [Fri, 28 Aug 2020 21:53:15 +0000 (21:53 +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:
8d50d88252 -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: If25d0749484b9e5045d7c40286bfa66266a6e17d
TreeHugger Robot [Fri, 28 Aug 2020 21:53:04 +0000 (21:53 +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:
b35e5e8b26 -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: I3dca11a1724fc2ed3642fb2f61b11f155f9e3575
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
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
TreeHugger Robot [Fri, 28 Aug 2020 21:46:29 +0000 (21:46 +0000)]
[automerger skipped] Merge "Send a response to an smp security request depending on the callback event" into qt-dev am:
e59e55074c -s ours
am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1
5b960d3490 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12448439
Change-Id: I62f7ba5d588cdba13aa04691df9b6ab48140bd71
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
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
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
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
TreeHugger Robot [Fri, 28 Aug 2020 19:27:01 +0000 (19:27 +0000)]
Merge "Send a response to an smp security request depending on the callback event" into qt-qpr1-dev
li-wei.cheng [Fri, 28 Aug 2020 18:32:24 +0000 (18:32 +0000)]
Return after removing sample LTK device am:
7c86810c44 am:
e8ba00c87c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12326768
Change-Id: I41bf5b6593e33b8ad18979f86789ae6649d1eac8
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
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
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
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
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
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
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
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
Rahul Sabnis [Wed, 5 Aug 2020 22:28:57 +0000 (22:28 +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:
2f1a14d58e -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: If193638c298db6668a1881824041f9b4bd5af764
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
Rahul Sabnis [Wed, 5 Aug 2020 22:04:08 +0000 (22:04 +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:
0b6fe27c5f -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: I15e4458e0589a2ce4b10d1d175f30bed8387c200
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
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
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
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
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
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
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
TreeHugger Robot [Wed, 5 Aug 2020 19:21:51 +0000 (19:21 +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:
40f09f54ec -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: Ic0ff9254155d0fc13c57274fa836346fbe97fc50
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
TreeHugger Robot [Wed, 5 Aug 2020 19:10:47 +0000 (19:10 +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 qt-dev am:
5667640792 -s ours
am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1
b763abb99e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12307474
Change-Id: Ia8237e641ef3644f78bb9845e51e5634d76b1b65
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
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
TreeHugger Robot [Wed, 5 Aug 2020 18:51:12 +0000 (18: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 qt-qpr1-dev
weichinweng [Wed, 5 Aug 2020 13:14:59 +0000 (13:14 +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:
100a9ce0e1 -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: Idba39a3384b9c2b0a7268a740661e722aa1ad47f
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
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
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
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
weichinweng [Wed, 5 Aug 2020 09:11:28 +0000 (09:11 +0000)]
Fix possible OOB when receive gatt read type response data am:
0eb7a763df am:
2cce69804f am:
e219a7f836
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12258750
Change-Id: Iaf6cb810e9aced654b009d12b3c48136a2bb88a0
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
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
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
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
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
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
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
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
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
Rahul Sabnis [Fri, 31 Jul 2020 01:46:35 +0000 (01:46 +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:
0733cdcef6 -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: I0e1a0b25c7a933b008eaa236c810c9d0dcef59f8
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
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
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
Rahul Sabnis [Fri, 31 Jul 2020 00:34:24 +0000 (00:34 +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:
c6edd09374 -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: I63378c114fff2eab6ade3471dff8f212ccf2eab9
Rahul Sabnis [Fri, 31 Jul 2020 00:34:07 +0000 (00:34 +0000)]
[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am:
8709264b5c -s ours am:
e23f192e8b -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: Ic79fd0a950561b9136b4f854c931fea5b1d89df2
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
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
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
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
Rahul Sabnis [Thu, 30 Jul 2020 00:18:43 +0000 (00:18 +0000)]
[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am:
b6bcc43c7b -s ours
am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1
fe287947a1 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12040224
Change-Id: I6b5ff2607b726813fe329ec2938085cf5da8bffb
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
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
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
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
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
Joseph Pirozzo [Fri, 26 Jun 2020 13:53:52 +0000 (13:53 +0000)]
Merge "Enable bitpool sanity checks" into oc-dev am:
15ccbf59de am:
b7bd79e254 am:
e7c4690a6b am:
6c9602b148 am:
31713cdf9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
11593936
Change-Id: I8bf46f136caa5defcca728a93f2807a63cfa1096
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
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
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
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
Joseph Pirozzo [Fri, 26 Jun 2020 12:40:58 +0000 (12:40 +0000)]
Merge "Enable bitpool sanity checks" into oc-dev
Myles Watson [Thu, 25 Jun 2020 22:22:23 +0000 (22:22 +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:
aba777da25 -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: Ib670a2692d6c3961d4e2eaade6b62d8994d690b4
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
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
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
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
Myles Watson [Thu, 25 Jun 2020 20:39:33 +0000 (20:39 +0000)]
[automerger skipped] DO NOT MERGE: Remove pairing on incoming bond request am:
e29c52cfda -s ours am:
594c470d27 -s ours am:
230d3180fb -s ours
am skip reason: Change-Id I048b7b142e3fe2096cf1a9aa2931c175fa52cd45 with SHA-1
21e580de3b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
11931864
Change-Id: I2a7bfd5c6ee7f01688ea3c680e29d692ed9cc56e
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
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
Myles Watson [Thu, 25 Jun 2020 19:50:05 +0000 (19:50 +0000)]
Remove pairing on incoming bond request am:
21e580de3b am:
73dd59984c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
11922796
Change-Id: If7636b869c35d1313637ca8200e36d13778832e3
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
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
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
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)