OSDN Git Service
Chen Chen [Tue, 6 Oct 2020 23:37:51 +0000 (23:37 +0000)]
Check Classic key before cross-key derivation am:
814160abca am:
6cddc6cd87 am:
98e0ae0ef9 am:
7337996317 am:
fa1724a501 am:
502d60e1e4 am:
75f78efd2f am:
f07b30362d
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736109
Change-Id: Ife65ad41daa62445b244b85b02832fc362473600
Chen Chen [Tue, 6 Oct 2020 23:20:11 +0000 (23:20 +0000)]
Check Classic key before cross-key derivation am:
814160abca am:
6cddc6cd87 am:
98e0ae0ef9 am:
7337996317 am:
fa1724a501 am:
502d60e1e4 am:
75f78efd2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736109
Change-Id: Ie5f92538d13e353f7bdd68490e4f52c3d8274d9c
Chen Chen [Tue, 6 Oct 2020 22:13:45 +0000 (22:13 +0000)]
Check Classic key before cross-key derivation am:
814160abca am:
6cddc6cd87 am:
98e0ae0ef9 am:
7337996317 am:
fa1724a501 am:
502d60e1e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736109
Change-Id: I1ed229afa0015de7ac4af6d417ec64fc1a74121e
Chen Chen [Tue, 6 Oct 2020 21:45:27 +0000 (21:45 +0000)]
Check Classic key before cross-key derivation am:
814160abca am:
6cddc6cd87 am:
98e0ae0ef9 am:
7337996317 am:
fa1724a501
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736109
Change-Id: I6ccef29a5b8bbe61ad33317c1ff0add3e8f7927e
Chen Chen [Tue, 6 Oct 2020 20:53:43 +0000 (20:53 +0000)]
Check Classic key before cross-key derivation am:
814160abca am:
6cddc6cd87 am:
98e0ae0ef9 am:
7337996317
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736109
Change-Id: Iaa69ebded8be2055cb9fee48d2d0b2e3ec8365cf
Chen Chen [Tue, 6 Oct 2020 20:16:04 +0000 (20:16 +0000)]
Check Classic key before cross-key derivation am:
814160abca am:
6cddc6cd87 am:
98e0ae0ef9
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736109
Change-Id: I7d010b57ab226b166d9895d95101056b2f305d31
Chen Chen [Tue, 6 Oct 2020 19:57:19 +0000 (19:57 +0000)]
Check Classic key before cross-key derivation am:
814160abca am:
6cddc6cd87
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736109
Change-Id: I1391cb656ed035aaec7beb0f2c11e5b3c008f4cc
Chen Chen [Tue, 6 Oct 2020 18:52:36 +0000 (18:52 +0000)]
Check Classic key before cross-key derivation am:
814160abca
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736109
Change-Id: I10b980c9f480dd9e2f2adb5af47cb23ff99421e6
Chen Chen [Thu, 24 Sep 2020 00:02:58 +0000 (17:02 -0700)]
Check Classic key before cross-key derivation
Bug:
158854097
Test: atest net_test_stack_smp
Tag: #security
Ignore-AOSP-First: Security fix
Exempt-From-Owner-Approval: Already got owner approval,
but somehow it still shows no owner vote
Change-Id: Id88241324e9fb89ef14e50b52eb459a0d81c492b
Chen Chen [Tue, 6 Oct 2020 17:47:33 +0000 (17:47 +0000)]
Merge "Check Classic key before cross-key derivation" into rvc-qpr-dev
TreeHugger Robot [Tue, 6 Oct 2020 10:12:08 +0000 (10:12 +0000)]
Merge "Check Classic key before cross-key derivation" into qt-qpr1-dev am:
285caebef7 am:
ace3e37d8c am:
1ef4307051
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687759
Change-Id: I527591fb772af347a40c387eac565bc5ecf3a614
TreeHugger Robot [Tue, 6 Oct 2020 09:34:16 +0000 (09:34 +0000)]
Merge "Check Classic key before cross-key derivation" into qt-qpr1-dev am:
285caebef7 am:
ace3e37d8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687759
Change-Id: I431f6ba0eceff663fd358b8281ed462f4d0b0730
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 05:35:26 +0000 (05:35 +0000)]
Check Classic key before cross-key derivation am:
992e25e6b9 am:
eec1a1e896 am:
212d730545 am:
6884783558 am:
b5b63154d7 am:
bf000ad36f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736893
Change-Id: I9c6ea89069ac97780c5103d79f0a1e15d1a5d0ae
Chen Chen [Tue, 6 Oct 2020 05:35:19 +0000 (05:35 +0000)]
Check Classic key before cross-key derivation am:
da8aa68903 am:
85a7c65c28 am:
9407e4f700 am:
1db44e4aeb am:
9064df5235
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687761
Change-Id: Ibe05194db6854db3ac751f1604d3d77b2f57e83e
Chen Chen [Tue, 6 Oct 2020 05:35:12 +0000 (05:35 +0000)]
Check Classic key before cross-key derivation am:
d3521aa04a am:
364407c8d2 am:
aad205be66 am:
b9cab6c940
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687760
Change-Id: I6776fc9cc097718d7e02571e465f9c299800c9de
Chen Chen [Tue, 6 Oct 2020 05:13:29 +0000 (05:13 +0000)]
Check Classic key before cross-key derivation am:
992e25e6b9 am:
eec1a1e896 am:
212d730545 am:
6884783558 am:
b5b63154d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736893
Change-Id: I955b3e20f0675a18603f1888bf8775c91fc386f1
Chen Chen [Tue, 6 Oct 2020 05:13:20 +0000 (05:13 +0000)]
Check Classic key before cross-key derivation am:
da8aa68903 am:
85a7c65c28 am:
9407e4f700 am:
1db44e4aeb
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687761
Change-Id: I50dced972c7ac60abfe0fa3bd02e20d6fcca5cb2
Chen Chen [Tue, 6 Oct 2020 05:13:12 +0000 (05:13 +0000)]
Check Classic key before cross-key derivation am:
d3521aa04a am:
364407c8d2 am:
aad205be66
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687760
Change-Id: I2f9b0409b41e9cee0151e290b443ade2a7d6aaac
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:33:04 +0000 (04:33 +0000)]
Check Classic key before cross-key derivation am:
16146379ad am:
d82141f378
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12684514
Change-Id: I2c8095c2ebcf142e47bccf6df3941268c9b9273f
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 04:15:32 +0000 (04:15 +0000)]
Check Classic key before cross-key derivation am:
16146379ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12684514
Change-Id: I5886396032be21a2e2230d2bbeb285c57fe1c68b
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
Ted Wang [Thu, 24 Sep 2020 11:24:24 +0000 (19:24 +0800)]
Reject SetBrowsedPlayer if there is not browsable player
Tag: #compatibility
Bug:
163109635
Test: atest net_test_avrcp
Change-Id: I587ca0d514b50c7a72269eef86a8b5ff38343d05
Merged-In: I587ca0d514b50c7a72269eef86a8b5ff38343d05
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 [Wed, 23 Sep 2020 07:17:13 +0000 (07:17 +0000)]
Merge "Fix crash in smp_br_state_machine_event" into rvc-qpr-dev
Jakub Pawlowski [Tue, 22 Sep 2020 22:01:26 +0000 (22:01 +0000)]
Merge "fix oob in avrc_ctrl_pars_vendor_cmd" into rvc-dev am:
a6d074922e am:
6d0b29e317
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12628928
Change-Id: I9a7dc376bcc02c70501ea5a0b5d27d6e976cecbd
Jakub Pawlowski [Tue, 22 Sep 2020 21:30:37 +0000 (21:30 +0000)]
Merge "fix oob in avrc_ctrl_pars_vendor_cmd" into rvc-dev am:
a6d074922e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12628928
Change-Id: I122cd8e9fcc7336fe8468915286a80569e835905
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 01:17:07 +0000 (01:17 +0000)]
Merge "HciHalRootCanalTest: Use ASSERT and retry reads" into rvc-dev am:
ae8049033b am:
9a6e53e658
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12654144
Change-Id: I4e519b768913bbf15d7a0ab93d4f59a69144c56e
TreeHugger Robot [Tue, 22 Sep 2020 00:37:54 +0000 (00:37 +0000)]
Merge "HciHalRootCanalTest: Use ASSERT and retry reads" into rvc-dev am:
ae8049033b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12654144
Change-Id: I88e7f230acf9fb82d338dce2bdcd816348dda87c
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
Jakub Pawlowski [Mon, 14 Sep 2020 20:11:37 +0000 (22:11 +0200)]
Fix crash in smp_br_state_machine_event
p_cb->role value should be checked before it's used
Test: compilation
Bug:
162327732
Change-Id: I5f4ed835621a0a94fa04d41febad02b8f1c11b89
Ted Wang [Wed, 19 Aug 2020 08:01:33 +0000 (16:01 +0800)]
Add Mazda Carkit into IOP table to only use AVRCP 1.4
Tag: #compatibility
Bug:
163215217
Test: Manaual
Change-Id: I150d1f9417df8c42612cb11f714c0d08e6634eb1
Ted Wang [Thu, 6 Aug 2020 06:44:43 +0000 (14:44 +0800)]
Add Honda Civic Carkit into IOP table to only use AVRCP 1.4
Tag: #compatibility
Bug:
161911491
Test: Maual
Change-Id: I25e939fbd98eef6a5d8e731b937f9afce73f3faa
TreeHugger Robot [Mon, 31 Aug 2020 19:36:52 +0000 (19:36 +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:
7aaf2edf90 -s ours am:
9e9d470728 -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: I037eaefda5fd3b9a31c7cdda8f2a05688652c58d
li-wei.cheng [Mon, 31 Aug 2020 19:36:40 +0000 (19:36 +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:
c110eca93d -s ours am:
a2190e8733 -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: I6253ed6205498f1bcf9094befe976cf88f5b6202
Jakub Pawlowski [Mon, 31 Aug 2020 19:36:27 +0000 (19:36 +0000)]
[automerger skipped] Don't persist bonds using sample LTK am:
70411f0877 -s ours am:
f79ba4c65d am:
1c00e23d9f am:
e55b86fb06 am:
4cc53a75b7 am:
0ad5c231ed am:
2c100cdf60
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12484285
Change-Id: Id2ffc48d62df3ed95073db99b38ecc4c13e8fb07
TreeHugger Robot [Mon, 31 Aug 2020 18:49:58 +0000 (18:49 +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:
7aaf2edf90 -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: Ie1e72559012abe0d5049d245a27bcd8bec380dd5
li-wei.cheng [Mon, 31 Aug 2020 18:49:47 +0000 (18:49 +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:
c110eca93d -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: I6900ec5827caaf103137d94e996301af6271ecf8
Jakub Pawlowski [Mon, 31 Aug 2020 18:49:32 +0000 (18:49 +0000)]
[automerger skipped] Don't persist bonds using sample LTK am:
70411f0877 -s ours am:
f79ba4c65d am:
1c00e23d9f am:
e55b86fb06 am:
4cc53a75b7 am:
0ad5c231ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12484285
Change-Id: Ibda746931272bdd4c0c4bd1162eb6b561073b3ba
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:58:50 +0000 (22:58 +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:
7d8379fdca -s ours am:
f66550f191 -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: I3ead002d7dae6a0ee78ee63b96e323b17e3cecda
TreeHugger Robot [Fri, 28 Aug 2020 22:58:38 +0000 (22:58 +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:
c24d57d26a -s ours am:
b9e0832a0a -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: I5a1a24e7e4ed7150dc455ed935ae40e2d5f10d60
TreeHugger Robot [Fri, 28 Aug 2020 22:58:27 +0000 (22:58 +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:
f57a84e899 -s ours am:
f64bb77495 -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: I5e8e3202f099e5454815882f3e181f8b9efe5fc8
Rahul Sabnis [Fri, 28 Aug 2020 22:44:03 +0000 (22:44 +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:
7d8379fdca -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: I3431d9177fc7a785050fef4a8d12859cb47532d1
TreeHugger Robot [Fri, 28 Aug 2020 22:43:50 +0000 (22:43 +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:
c24d57d26a -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: I95995d392f4181e88a6ebac456c1cf20a4f30911
TreeHugger Robot [Fri, 28 Aug 2020 22:43:29 +0000 (22:43 +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:
f57a84e899 -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: Ife3cb7eddda301e6551ea15513fc609124ce5101
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 20:21:57 +0000 (20:21 +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:
f3cb766152 -s ours am:
1f0573b544 -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: I44aea14d42367c9da4fa1b23c15c921e7be58cdd
TreeHugger Robot [Fri, 28 Aug 2020 20:03:13 +0000 (20:03 +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:
f3cb766152 -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: Ic3fb03e09b35ccd7a46948a94faff1db7fea6785
TreeHugger Robot [Fri, 28 Aug 2020 19:56:42 +0000 (19:56 +0000)]
Merge "Send a response to an smp security request depending on the callback event" into rvc-dev am:
0af1f11bca am:
d88c1cd12d
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12438280
Change-Id: Ife214d7ddcee9f917b38dd0610dcd7c3d2289898
li-wei.cheng [Fri, 28 Aug 2020 19:56:29 +0000 (19:56 +0000)]
Return after removing sample LTK device am:
7c86810c44 am:
e8ba00c87c am:
a326247710 am:
8d694bd6d1 am:
fa09d017b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12326768
Change-Id: I1de7da6ecb5371ac36485e3e27e07f515bdba452
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:39:21 +0000 (19:39 +0000)]
Merge "Send a response to an smp security request depending on the callback event" into rvc-dev am:
0af1f11bca
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12438280
Change-Id: I9375f2cd3939e4c9d818f54a8a066261cc218f00
li-wei.cheng [Fri, 28 Aug 2020 19:39:05 +0000 (19:39 +0000)]
Return after removing sample LTK device am:
7c86810c44 am:
e8ba00c87c am:
a326247710 am:
8d694bd6d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12326768
Change-Id: I5a0cf5848b0390442a765e4adb088e901efedda7
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