OSDN Git Service
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
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: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
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
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
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:59:17 +0000 (19:59 +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:
e2e784ea69 -s ours am:
1e9bf31a02 -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: I2794538d95c95c886c7779f911f39cc54d1e6f88
TreeHugger Robot [Wed, 5 Aug 2020 19:58:48 +0000 (19:58 +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:
6836ded86a -s ours am:
aec0292a2e -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: I4f659ca569e770a8b012b020addbf29be21aad16
TreeHugger Robot [Wed, 5 Aug 2020 19:58:17 +0000 (19:58 +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:
2727610c3d -s ours am:
9b12267581 -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: I44e3224fcb1a5b9fc2c94ca7ce3d74b019581518
TreeHugger Robot [Wed, 5 Aug 2020 19:38:51 +0000 (19: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 pi-dev am:
2b178f7896 -s ours am:
40f09f54ec -s ours am:
e1660e8e98 -s ours am:
e2e784ea69 -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: I5c26b53f92fe5f385de3d0cb05dae1fc5aeaedd7
TreeHugger Robot [Wed, 5 Aug 2020 19:38:25 +0000 (19: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 qt-dev am:
5667640792 -s ours am:
26511f3923 -s ours am:
6836ded86a -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: Iab7102410cda47d4a8cb0b97e6cd5929acb9ae5f
TreeHugger Robot [Wed, 5 Aug 2020 19:38:03 +0000 (19: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 qt-qpr1-dev am:
cca9f79c88 -s ours am:
2727610c3d -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: I7c2cabd12e1d568f411b2bf9bb452064d67d2705
TreeHugger Robot [Wed, 5 Aug 2020 19:30:18 +0000 (19:30 +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 am:
272bfa7988 am:
c339bfc4da
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12287594
Change-Id: Iacd7eae43cf638e8fb595ed1076758282777cf54
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 19:03:32 +0000 (19:03 +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 am:
272bfa7988
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12287594
Change-Id: I385438191c2574979165e32e703e3f2d6cdd7cdc
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 14:23:00 +0000 (14:23 +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:
8a5a0c7841 -s ours am:
86ed9147a3 -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: I0b3669a8a5f13ffbd1f7d298a3cd6fb45749b0f1
weichinweng [Wed, 5 Aug 2020 13:58:10 +0000 (13:58 +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:
8a5a0c7841 -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: I38f651d1ade959dd1e43d4cbcc87fcc514d43034
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 10:06:53 +0000 (10:06 +0000)]
Fix possible OOB when receive gatt read type response data am:
0eb7a763df am:
2cce69804f am:
e219a7f836 am:
6717d3dc7e am:
d03b5b8cc6 am:
23773fce44
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12258750
Change-Id: I2f74649ee9e4a575556856011d22ac15108fa777
weichinweng [Wed, 5 Aug 2020 09:46:59 +0000 (09:46 +0000)]
Fix possible OOB when receive gatt read type response data am:
0eb7a763df am:
2cce69804f am:
e219a7f836 am:
6717d3dc7e am:
d03b5b8cc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12258750
Change-Id: I4088edebdc3f833adbe83bed3660e92e45664f6a
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
Rahul Sabnis [Sat, 1 Aug 2020 02:44:27 +0000 (19:44 -0700)]
Check whether local device is an ATV device to determine whether to show
the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode
Tag: #feature
Bug:
157038281
Test: Manual
Merged-In: I6d06f5996da71e5a1407e544b0023d82924aa56f
Change-Id: I6d06f5996da71e5a1407e544b0023d82924aa56f
Rahul Sabnis [Sat, 1 Aug 2020 02:44:27 +0000 (19:44 -0700)]
Check whether local device is an ATV device to determine whether to show
the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode
Tag: #feature
Bug:
157038281
Test: Manual
Merged-In: I6d06f5996da71e5a1407e544b0023d82924aa56f
Change-Id: I6d06f5996da71e5a1407e544b0023d82924aa56f
weichinweng [Tue, 28 Jul 2020 08:56:33 +0000 (16:56 +0800)]
Fix possible OOB when receive gatt read type response data
Bug:
158833854
Bug:
158778659
Test: manual
Tag: #security
Change-Id: I1bd8713eecebc2bc3d919402b035987e06a2d4d3
Rahul Sabnis [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
android-build-team Robot [Fri, 31 Jul 2020 23:02:35 +0000 (23:02 +0000)]
Snap for
6727488 from
e96d34e2a65aec726b6f745f2340a36c040b9b2f to rvc-qpr1-release
Change-Id: I50cb837110446b112d18be95bde2c8b630b56080
Rahul Sabnis [Fri, 31 Jul 2020 02:42:39 +0000 (02:42 +0000)]
[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am:
57ffe1ba12 am:
70e77e9a2f -s ours am:
459630e366 -s ours am:
5830285595 -s ours am:
0733cdcef6 -s ours am:
48578a77f7 -s ours am:
162fcf41e5 -s ours am:
09b4b479f4 -s ours
am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1
b5c0bfc132 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12040226
Change-Id: I0a07eb5d97ca897b4568c2a948c2649530233b8b
Rahul Sabnis [Fri, 31 Jul 2020 02:25:25 +0000 (02:25 +0000)]
[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am:
57ffe1ba12 am:
70e77e9a2f -s ours am:
459630e366 -s ours am:
5830285595 -s ours am:
0733cdcef6 -s ours am:
48578a77f7 -s ours am:
162fcf41e5 -s ours
am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1
b5c0bfc132 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12040226
Change-Id: I50b14c582f2884f41d166bc658fb3025da32a693
Rahul Sabnis [Fri, 31 Jul 2020 02:04:48 +0000 (02:04 +0000)]
[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am:
57ffe1ba12 am:
70e77e9a2f -s ours am:
459630e366 -s ours am:
5830285595 -s ours am:
0733cdcef6 -s ours am:
48578a77f7 -s ours
am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1
b5c0bfc132 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12040226
Change-Id: I76d8512c71be6dcd619cce5f828cd56b173ece14
Rahul Sabnis [Fri, 31 Jul 2020 01:46:35 +0000 (01:46 +0000)]
[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am:
57ffe1ba12 am:
70e77e9a2f -s ours am:
459630e366 -s ours am:
5830285595 -s ours am:
0733cdcef6 -s ours
am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1
b5c0bfc132 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12040226
Change-Id: I0e1a0b25c7a933b008eaa236c810c9d0dcef59f8