OSDN Git Service
TreeHugger Robot [Tue, 6 Oct 2020 08:51:28 +0000 (08:51 +0000)]
Merge "Check Classic key before cross-key derivation" into qt-qpr1-dev am:
285caebef7
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687759
Change-Id: If5f3d6fc4f8b7f93144459e45ca8588cf47cf1fa
TreeHugger Robot [Tue, 6 Oct 2020 08:34:08 +0000 (08:34 +0000)]
Merge "Check Classic key before cross-key derivation" into qt-qpr1-dev
Chen Chen [Tue, 6 Oct 2020 04:38:13 +0000 (04:38 +0000)]
Check Classic key before cross-key derivation am:
992e25e6b9 am:
eec1a1e896 am:
212d730545 am:
6884783558
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736893
Change-Id: Ic22e35a189b734585ab561aeb0ce8d263297ba42
Chen Chen [Tue, 6 Oct 2020 04:38:04 +0000 (04:38 +0000)]
Check Classic key before cross-key derivation am:
da8aa68903 am:
85a7c65c28 am:
9407e4f700
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687761
Change-Id: Id279e08fa997f4c7eb748c2aeaf410f31e8860c5
Chen Chen [Tue, 6 Oct 2020 04:37:51 +0000 (04:37 +0000)]
Check Classic key before cross-key derivation am:
d3521aa04a am:
364407c8d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687760
Change-Id: I3df576be2b48b49834814309fa495ec6a975f460
Chen Chen [Tue, 6 Oct 2020 04:20:30 +0000 (04:20 +0000)]
Check Classic key before cross-key derivation am:
992e25e6b9 am:
eec1a1e896 am:
212d730545
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736893
Change-Id: Ia482be10c8ac7372a4d36c557e740a83231b10ae
Chen Chen [Tue, 6 Oct 2020 04:20:24 +0000 (04:20 +0000)]
Check Classic key before cross-key derivation am:
da8aa68903 am:
85a7c65c28
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687761
Change-Id: I494f299169e329ece034da105c83e392a13dc875
Chen Chen [Tue, 6 Oct 2020 04:20:18 +0000 (04:20 +0000)]
Check Classic key before cross-key derivation am:
d3521aa04a
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687760
Change-Id: I93f154a331ecfdee704321bd3e94758c18005658
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
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
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
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
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
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
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
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
Jakub Pawlowski [Tue, 22 Sep 2020 21:14:20 +0000 (21:14 +0000)]
Merge "fix oob in avrc_ctrl_pars_vendor_cmd" into rvc-dev
TreeHugger Robot [Tue, 22 Sep 2020 00:07:05 +0000 (00:07 +0000)]
Merge "HciHalRootCanalTest: Use ASSERT and retry reads" into rvc-dev
Myles Watson [Sat, 9 May 2020 13:38:57 +0000 (06:38 -0700)]
HciHalRootCanalTest: Use ASSERT and retry reads
Tag: #gd-refactor
Bug:
156148686
Test: atest bluetooth_test_gd
(while building Android)
Change-Id: I4a69e172eda911e24ecf7482cd88a724139ca29d
Merged-In: I4a69e172eda911e24ecf7482cd88a724139ca29d
Jakub Pawlowski [Fri, 18 Sep 2020 07:41:34 +0000 (09:41 +0200)]
fix oob in avrc_ctrl_pars_vendor_cmd
Bug:
168712245
Test: compilation
Tag: #security
Change-Id: I7d26f9817b0ec8ff9a177271ea45cc9dd6701472
TreeHugger Robot [Mon, 31 Aug 2020 18:34:35 +0000 (18:34 +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:
3f5ff9e9cd -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: I9fbacb404e1bc38d72b8c51a5b4df8aeae6a0bc2
li-wei.cheng [Mon, 31 Aug 2020 18:34:27 +0000 (18:34 +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:
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
Jakub Pawlowski [Mon, 31 Aug 2020 18:34:15 +0000 (18:34 +0000)]
[automerger skipped] Don't persist bonds using sample LTK am:
70411f0877 -s 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
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
Rahul Sabnis [Fri, 28 Aug 2020 22:24:06 +0000 (22:24 +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:
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
TreeHugger Robot [Fri, 28 Aug 2020 22:23:56 +0000 (22:23 +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:
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
TreeHugger Robot [Fri, 28 Aug 2020 22:23:46 +0000 (22:23 +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:
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
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:47:47 +0000 (19:47 +0000)]
[automerger skipped] Merge "Send a response to an smp security request 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
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
TreeHugger Robot [Fri, 28 Aug 2020 19:26:07 +0000 (19:26 +0000)]
Merge "Send a response to an smp security request depending on the callback event" into rvc-dev
li-wei.cheng [Fri, 28 Aug 2020 19:09:08 +0000 (19:09 +0000)]
Return after removing sample LTK device am:
7c86810c44 am:
e8ba00c87c am:
a326247710
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12326768
Change-Id: Ibbdfbb8cc697baf3550a4a20a7da71fdf5839202
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
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:45:34 +0000 (22:45 +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:
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
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:20:56 +0000 (22:20 +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:
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
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:28:52 +0000 (19: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 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
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:11:14 +0000 (19:11 +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:
26511f3923 -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: I6d16005a708b5fbc178a12cd7a195545aa1b6429
TreeHugger Robot [Wed, 5 Aug 2020 19:10:55 +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-qpr1-dev am:
cca9f79c88 -s ours
am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1
e198eb931d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12307313
Change-Id: I3589ecf7d95e4593606791c802db791d66af3856
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
TreeHugger Robot [Wed, 5 Aug 2020 18:48:50 +0000 (18:48 +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 rvc-dev
weichinweng [Wed, 5 Aug 2020 13:34:57 +0000 (13:34 +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:
9fde95f3b0 -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: Id4f4f4d2828f8031d2087f96ee01b18edc9072c1
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:27:16 +0000 (09:27 +0000)]
Fix possible OOB when receive gatt read type response data am:
0eb7a763df am:
2cce69804f am:
e219a7f836 am:
6717d3dc7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12258750
Change-Id: I351f5fb2a7146491b37cf306b1ad7ccc788920f5
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