aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-31[automerger skipped] Return after removing sample LTK device am: c6879c3fe5 ↵li-wei.cheng
am: bf69312868 am: 74ebab6814 -s ours am: 1f118853c5 -s ours am: 084f56e0af -s ours am: 801e68f7cc -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: I6e751cfbe1fcc4bf5dd6c39957eb5f18e2a5d34d
2020-08-31[automerger skipped] Don't persist bonds using sample LTK am: 70411f0877 -s ↵Jakub Pawlowski
ours am: f79ba4c65d am: 1c00e23d9f am: e55b86fb06 am: 4cc53a75b7 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12484285 Change-Id: I217b6d338f07a6b92005d6ccaa4926aaa2138cce
2020-08-31[automerger skipped] Return after removing sample LTK device am: c6879c3fe5 ↵li-wei.cheng
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
2020-08-31[automerger skipped] Don't persist bonds using sample LTK am: 70411f0877 -s ↵Jakub Pawlowski
ours am: f79ba4c65d am: 1c00e23d9f am: e55b86fb06 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12484285 Change-Id: I3a2dc1de7d57b588a0f5ed3dd935f0cce2510150
2020-08-31[automerger skipped] Return after removing sample LTK device am: c6879c3fe5 ↵li-wei.cheng
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
2020-08-31[automerger skipped] Don't persist bonds using sample LTK am: 70411f0877 -s ↵Jakub Pawlowski
ours am: f79ba4c65d am: 1c00e23d9f Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12484285 Change-Id: I2b6213a807eedaa840a15813efed81ed17d81e6d
2020-08-31[automerger skipped] Return after removing sample LTK device am: c6879c3fe5 ↵li-wei.cheng
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
2020-08-31[automerger skipped] Don't persist bonds using sample LTK am: 70411f0877 -s ↵Jakub Pawlowski
ours am: f79ba4c65d Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12484285 Change-Id: I7382773a19a2b7b098f9ce1bdb5364723dafa546
2020-08-31Return after removing sample LTK device am: c6879c3fe5 am: bf69312868li-wei.cheng
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12325453 Change-Id: I16cf93538d6d706acd22876712fa615dd820d12e
2020-08-31Return after removing sample LTK device am: c6879c3fe5li-wei.cheng
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12325453 Change-Id: I7bb17e11a74ed992191cd446408ee7bef4b984de
2020-08-31[automerger skipped] Don't persist bonds using sample LTK am: 70411f0877 -s oursJakub Pawlowski
am skip reason: skipped by user mylesgw Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12484285 Change-Id: Ia4bdeb2996c3bf7d7982f60a360b3790e542397d
2020-08-28[automerger skipped] Send a response to an smp security request depending on ↵Rahul Sabnis
the callback event am: 1570e8de12 -s ours am: 184ce57aa4 -s ours am: 8d50d88252 -s ours am: 5dbd5b6053 -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: I0a961ebb872632c9855df288f7aacfb950a06be3
2020-08-28[automerger skipped] Merge "Send a response to an smp security request ↵TreeHugger Robot
depending on the callback event" into pi-dev am: 9b8d6f75f1 -s ours am: b35e5e8b26 -s ours am: 8af3e32bc5 -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: I05b6b4bcba7a0d827c782954d127ee17134a0ec0
2020-08-28[automerger skipped] Merge "Send a response to an smp security request ↵TreeHugger Robot
depending on the callback event" into qt-dev am: e59e55074c -s ours am: b799bed2d9 -s ours am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1 3601e50959 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12448439 Change-Id: I84cec82acb65e4efbee04200312f261a4d47a74d
2020-08-28Don't persist bonds using sample LTKJakub Pawlowski
Test: compilation, manual testing Bug: 128843052 Bug: 162497143 Merged-In: I52fd484d42bf87e96dbc9e6456090f231ed48111 Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111 (cherry picked from commit 292fcf8612f488a2fcbf99614caba46ead076eb2)
2020-08-28[automerger skipped] Send a response to an smp security request depending on ↵Rahul Sabnis
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
2020-08-28[automerger skipped] Merge "Send a response to an smp security request ↵TreeHugger Robot
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
2020-08-28[automerger skipped] Send a response to an smp security request depending on ↵Rahul Sabnis
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
2020-08-28[automerger skipped] Merge "Send a response to an smp security request ↵TreeHugger Robot
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
2020-08-28[automerger skipped] Merge "Send a response to an smp security request ↵TreeHugger Robot
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
2020-08-28[automerger skipped] Send a response to an smp security request depending on ↵Rahul Sabnis
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
2020-08-28Merge "Send a response to an smp security request depending on the callback ↵TreeHugger Robot
event" into pi-dev
2020-08-28Merge "Send a response to an smp security request depending on the callback ↵TreeHugger Robot
event" into qt-dev
2020-08-28[automerger skipped] Merge "Send a response to an smp security request ↵TreeHugger Robot
depending on the callback event" into qt-qpr1-dev am: b4e6bd6209 -s ours am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1 3601e50959 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12448438 Change-Id: I6d3cb886b3f7a831d80c6209e8f175b87981e79a
2020-08-28Merge "Send a response to an smp security request depending on the callback ↵TreeHugger Robot
event" into qt-qpr1-dev
2020-08-28Merge "Send a response to an smp security request depending on the callback ↵TreeHugger Robot
event" into rvc-dev
2020-08-28Return after removing sample LTK device am: 7c86810c44 am: e8ba00c87c am: ↵li-wei.cheng
a326247710 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12326768 Change-Id: Ibbdfbb8cc697baf3550a4a20a7da71fdf5839202
2020-08-28Return after removing sample LTK device am: 7c86810c44 am: e8ba00c87cli-wei.cheng
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12326768 Change-Id: I41bf5b6593e33b8ad18979f86789ae6649d1eac8
2020-08-28Return after removing sample LTK device am: 7c86810c44li-wei.cheng
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12326768 Change-Id: I25110f82609f6cfaa27163f75f21ea46b8edb780
2020-08-25Send a response to an smp security request depending on the callback eventRahul Sabnis
Tag: #feature Bug: 157038281 Test: Manual Merged-In: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 Change-Id: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351
2020-08-25Send a response to an smp security request depending on the callback eventRahul Sabnis
Tag: #feature Bug: 157038281 Test: Manual Merged-In: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 Change-Id: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351
2020-08-25Send a response to an smp security request depending on the callback eventRahul Sabnis
Tag: #feature Bug: 157038281 Test: Manual Merged-In: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 Change-Id: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351
2020-08-25Send a response to an smp security request depending on the callback eventRahul Sabnis
Tag: #feature Bug: 157038281 Test: Manual Merged-In: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 Change-Id: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351
2020-08-25Send a response to an smp security request depending on the callback eventRahul Sabnis
Tag: #feature Bug: 157038281 Test: Manual Merged-In: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 Change-Id: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351
2020-08-06Return after removing sample LTK deviceli-wei.cheng
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
2020-08-06Return after removing sample LTK deviceli-wei.cheng
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
2020-08-05[automerger skipped] Merge "Check whether local device is an ATV device to ↵Rahul Sabnis
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: 02ed5a5e79 -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: I365e3e41698a11d27dd023e569dc54371380e966
2020-08-05[automerger skipped] Merge "Check whether local device is an ATV device to ↵Rahul Sabnis
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
2020-08-05[automerger skipped] Merge "Check whether local device is an ATV device to ↵Rahul Sabnis
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: bd13a8fe3d -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: Iefd53d93e70926f0d846df8fb63314bc53fb2191
2020-08-05[automerger skipped] Merge "Check whether local device is an ATV device to ↵Rahul Sabnis
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
2020-08-05[automerger skipped] Merge "Check whether local device is an ATV device to ↵Rahul Sabnis
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
2020-08-05[automerger skipped] Merge "Check whether local device is an ATV device to ↵Rahul Sabnis
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
2020-08-05[automerger skipped] Merge "Check whether local device is an ATV device to ↵Rahul Sabnis
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
2020-08-05[automerger skipped] Merge "Check whether local device is an ATV device to ↵Rahul Sabnis
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
2020-08-05Merge "Check whether local device is an ATV device to determine whether to ↵Rahul Sabnis
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
2020-08-05[automerger skipped] Merge "Check whether local device is an ATV device to ↵Rahul Sabnis
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
2020-08-05Merge "Check whether local device is an ATV device to determine whether to ↵Rahul Sabnis
show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-dev
2020-08-05Merge "Check whether local device is an ATV device to determine whether to ↵Rahul Sabnis
show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-mr1-dev
2020-08-05[automerger skipped] Merge "Check whether local device is an ATV device to ↵TreeHugger Robot
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: e1660e8e98 -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: I44672bdde95297e677b0fa8167734a58fae6c906
2020-08-05[automerger skipped] Merge "Check whether local device is an ATV device to ↵TreeHugger Robot
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 20:46:15 +0000