git.osdn.net Git - android-x86/system-bt.git/log

[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

[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

[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

Merge "Send a response to an smp security request depending on the callback event" into qt-dev

[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

[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

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

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

Merge "Send a response to an smp security request depending on the callback event" into qt-qpr1-dev

Merge "Send a response to an smp security request depending on the callback event" into rvc-dev

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

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

Return after removing sample LTK device am: 7c86810c44

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12326768

Change-Id: I25110f82609f6cfaa27163f75f21ea46b8edb780

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

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

[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

[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

[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

[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

[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

[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

[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

[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

[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

[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

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

[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

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

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

[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

[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

[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

[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

[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

[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

[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

[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

[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

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

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

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

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

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

[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

[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

[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

[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

[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

[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

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

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

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

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

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

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

Fix possible OOB when receive gatt read type response data

Bug: 158833854
Bug: 158778659
Test: manual
Tag: #security

Change-Id: I1bd8713eecebc2bc3d919402b035987e06a2d4d3
Merged-In: I1bd8713eecebc2bc3d919402b035987e06a2d4d3

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

Fix possible OOB when receive gatt read type response data

Bug: 158833854
Bug: 158778659
Test: manual
Tag: #security

Change-Id: I1bd8713eecebc2bc3d919402b035987e06a2d4d3

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

[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

[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

[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

[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 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: I63dd8398d5a268766d7a8f71acfd0597893e18ba

[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 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: I7e5b93e63eadbda49fc9ff28a6308a72e99b6ef0

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: b5c0bfc132 -s ours am: e66f27327b -s ours am: c6edd09374 -s ours am: c067728850 -s ours am: 49dd78710b -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 8709264b5c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040225

Change-Id: I7e5d5a12760d89a24507b23f2c1a0ddeb5a03c06

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: 8709264b5c -s ours am: e23f192e8b -s ours am: d1b1c29df5 -s ours am: c7be9b4a67 -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 b6bcc43c7b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040241

Change-Id: I4d1071ad3937a3f787dd964159d95ffea59adb7e

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: b5c0bfc132 -s ours am: e66f27327b -s ours am: c6edd09374 -s ours am: c067728850 -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 8709264b5c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040225

Change-Id: I2e3c095ed07646bca7b0782b9f4ebae3e22cb979

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: 8709264b5c -s ours am: e23f192e8b -s ours am: d1b1c29df5 -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 b6bcc43c7b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040241

Change-Id: I2a262c9cea628c7871ce6cbe5fd4dee00c17344e

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: 57ffe1ba12 am: 70e77e9a2f -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: I5ad01f31ae5ad09d350a04ff3414ae516ad0077d

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: b5c0bfc132 -s ours am: e66f27327b -s ours am: c6edd09374 -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 8709264b5c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040225

Change-Id: I63378c114fff2eab6ade3471dff8f212ccf2eab9

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: 8709264b5c -s ours am: e23f192e8b -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 b6bcc43c7b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040241

Change-Id: Ic79fd0a950561b9136b4f854c931fea5b1d89df2

Shows a consent dialog on the local device when pairing a bluetooth low am: 57ffe1ba12

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040226

Change-Id: I591af4f49890b67d9d110747984e1061aeaa9a57

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: b5c0bfc132 -s ours am: e66f27327b -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 8709264b5c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040225

Change-Id: Iaec291391db339a109db382c530918bc4090357f

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: 8709264b5c -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 b6bcc43c7b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040241

Change-Id: If96604b3f5b0843bae5ea46c4806a46af523cf26

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: b5c0bfc132 -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 8709264b5c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040225

Change-Id: Ibf60879048f2eea001a0b5c3cf4f9a4fcdb3edd6

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: b6bcc43c7b -s ours am: 5cf5a4c43b -s ours am: 3440d38745 -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 fe287947a1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040224

Change-Id: I90870b915d74f811e1ae091c16fbf4b4d5ab6b44

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: b6bcc43c7b -s ours am: 5cf5a4c43b -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 fe287947a1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040224

Change-Id: If552b7dc90a1a4cb003bea09d6d67587eeec47b3

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: b6bcc43c7b -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 fe287947a1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040224

Change-Id: I6b5ff2607b726813fe329ec2938085cf5da8bffb

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: fe287947a1 -s ours am: d48fb2accf -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 03580fc440 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040221

Change-Id: Ib14a80e5a172038181f479d6fe8ba8307546d5a1

[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: fe287947a1 -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 03580fc440 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040221

Change-Id: Idc6c5347d68d2d72262293bb4d897a5d383a631e

Shows a consent dialog on the local device when pairing a bluetooth low am: 03580fc440

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12010399

Change-Id: I4491e2a0bda3765831ba363f7b98cdfaea2938a1

Shows a consent dialog on the local device when pairing a bluetooth low
energy device if the local device has a display.

Tag: #security
Bug: 157038281
Test: Manual
Merged-In: I7de396230beb84bd0fa2b0cea346523b6824472a
Change-Id: I7de396230beb84bd0fa2b0cea346523b6824472a

Make libbluetooth-types-header available for native_bridge am: a6d57793a6

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12128049

Change-Id: I9107f054b4740cce2a0f726c8a8938b172c3ee9e

Make libbluetooth-types-header available for native_bridge

Bug: http://b/153609531

Test: m libhardware.native_bridge

Change-Id: Ie5b208ce304cadd95bdc121549a20dacbf2d01b1
Merged-In: Ie5b208ce304cadd95bdc121549a20dacbf2d01b1

Merge "Enable bitpool sanity checks" into oc-dev am: 15ccbf59de am: b7bd79e254 am: e7c4690a6b am: 6c9602b148 am: 31713cdf9f am: 3d17223fed am: 56f635560d

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/11593936

Change-Id: I6663ef41447d8b9dcfa0a94fa76e159f797e066c

Merge "Enable bitpool sanity checks" into oc-dev am: 15ccbf59de am: b7bd79e254 am: e7c4690a6b am: 6c9602b148 am: 31713cdf9f am: 3d17223fed

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/11593936

Change-Id: Iaa730fbb18f95495c23c40711227dd01a2ebffd6

Merge "Enable bitpool sanity checks" into oc-dev am: 15ccbf59de am: b7bd79e254 am: e7c4690a6b am: 6c9602b148 am: 31713cdf9f

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/11593936

Change-Id: I8bf46f136caa5defcca728a93f2807a63cfa1096

Merge "Enable bitpool sanity checks" into oc-dev am: 15ccbf59de am: b7bd79e254 am: e7c4690a6b am: 6c9602b148

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/11593936

Change-Id: Ie5a818b066a2d2d4401cbe22d399fd75a97a4f5b

Merge "Enable bitpool sanity checks" into oc-dev am: 15ccbf59de am: b7bd79e254 am: e7c4690a6b

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/11593936

Change-Id: Id273f7a0dcccdd41a0cc5f7dc9c782477aaf046b