OSDN Git Service
android-build-team Robot [Wed, 30 Sep 2020 23:12:45 +0000 (23:12 +0000)]
Snap for
6875707 from
aec3a4681b893ebdc022740d74b678eaa3945850 to rvc-qpr1-release
Change-Id: I219a75fb436577918a3c4bb77e27d3a7470906cf
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
android-build-team Robot [Wed, 23 Sep 2020 23:13:13 +0000 (23:13 +0000)]
Snap for
6859016 from
b54a294f46dc06affbd76b7d404fd6157e17e260 to rvc-qpr1-release
Change-Id: I5a66cb27d949d195b22848d20bc1d825cf87b5a4
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
android-build-team Robot [Tue, 22 Sep 2020 23:07:44 +0000 (23:07 +0000)]
Snap for
6855963 from
167cff54c8ebd2a00e3cdd7a55423b71fd1419c4 to rvc-qpr1-release
Change-Id: I0d8086c7501da847634f098762ac1798ddc99499
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
android-build-team Robot [Wed, 16 Sep 2020 23:06:52 +0000 (23:06 +0000)]
Snap for
6841706 from
6617ec16599df05e32e1cefb97f7426b00e83917 to rvc-qpr1-release
Change-Id: I4019a9f1494be8efeb06c8775ba7d635bf6c4d98
android-build-team Robot [Tue, 15 Sep 2020 23:08:29 +0000 (23:08 +0000)]
Snap for
6838106 from
cbc5d9c6939a30fe5158152ce7e8790e9a68fea1 to rvc-qpr1-release
Change-Id: I4b779024707a7f3587ef681c786ff6ab8f2dfd86
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
android-build-team Robot [Mon, 31 Aug 2020 23:02:30 +0000 (23:02 +0000)]
Snap for
6803753 from
a755f0ec5876553a8baecdb62acc967ed1f302d3 to rvc-qpr1-release
Change-Id: I5efbe5cd2d50823881102c365f641e4bf0a6f5eb
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
android-build-team Robot [Sat, 29 Aug 2020 21:12:07 +0000 (21:12 +0000)]
Snap for
6800518 from
77398b587f5c5400c1245d84cfb5dc55dcfa5e71 to rvc-qpr1-release
Change-Id: Icac8a90467f1fd22cc3bc8cffefcd10915110eef
android-build-team Robot [Fri, 28 Aug 2020 23:07:33 +0000 (23:07 +0000)]
Snap for
6799200 from
8bedb9bb2fe647725cff850a09d2c413381648d8 to rvc-qpr1-release
Change-Id: I21c0dfd0688437ae2030c23f2caebb983360e250
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
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
android-build-team Robot [Thu, 6 Aug 2020 23:09:04 +0000 (23:09 +0000)]
Snap for
6743184 from
2800255d602402cca0d5aeccbfb763d4e2d40751 to rvc-qpr1-release
Change-Id: I6eaf6db220ec378d81f8b81a14f28dd2f8de572b
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 23:32:53 +0000 (23:32 +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:
c701b3bebc -s ours am:
dc8c143d2a -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: Id7cc460ac0b584711789b759db90961b120a2c85
android-build-team Robot [Wed, 5 Aug 2020 23:11:33 +0000 (23:11 +0000)]
Snap for
6740034 from
a6ed63fb83e379fb56af0510eebbd5701b26f8e3 to rvc-qpr1-release
Change-Id: Idaf257e530ef54262d7bbf8b90eea0f8c20d6cfe
Rahul Sabnis [Wed, 5 Aug 2020 23:01:50 +0000 (23:01 +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:
c701b3bebc -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: I3282ed98189270958770476431af6e10b1c3d352
Rahul Sabnis [Wed, 5 Aug 2020 22:53:22 +0000 (22: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-mr1-dev am:
4256337c9e -s ours am:
d24757a4f0 -s ours am:
0b6fe27c5f -s ours am:
bd13a8fe3d -s ours am:
aeda81c1d5 -s ours am:
dae70103cc -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: I8356b7224243f9a4cb2b305b20a2a915421543d8
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:38:24 +0000 (22:38 +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:
aeda81c1d5 -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: If8f5b2b9b2d7635f55dde196824a1456cc6acae8
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
OSDN Git Service
