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

[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

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

Fix possible OOB when receive gatt read type response data

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

Change-Id: I1bd8713eecebc2bc3d919402b035987e06a2d4d3

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

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

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

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

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

Change-Id: I1f53339a2b08ec342d65fe45f6a69965b87edf4a

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

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

Change-Id: I53a4ce34dba71b7715f791a03b6128458f8bc7e8

Merge "Enable bitpool sanity checks" into oc-dev

Merge "HF_CLIENT: Upgrade version from 1.6 to 1.7" into rvc-dev

[automerger skipped] DO NOT MERGE: Remove pairing on incoming bond request am: 85b5df1d0d am: ab50a6b284 -s ours am: 14b17d2fb1 -s ours am: db513f6c97 -s ours am: aba777da25 -s ours am: 43c721bd30 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I001906a261ca3465f9da21804c3ed6b388bfb9d1

[automerger skipped] DO NOT MERGE: Remove pairing on incoming bond request am: 85b5df1d0d am: ab50a6b284 -s ours am: 14b17d2fb1 -s ours am: db513f6c97 -s ours am: aba777da25 -s ours

am skip reason: Change-Id I048b7b142e3fe2096cf1a9aa2931c175fa52cd45 with SHA-1 e29c52cfda is in history

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

Change-Id: Ib670a2692d6c3961d4e2eaade6b62d8994d690b4

[automerger skipped] DO NOT MERGE: Remove pairing on incoming bond request am: 85b5df1d0d am: ab50a6b284 -s ours am: 14b17d2fb1 -s ours am: db513f6c97 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id0a0e93bcdc38a92212eed4e41d09db6ed6ab37f

[automerger skipped] DO NOT MERGE: Remove pairing on incoming bond request am: 85b5df1d0d am: ab50a6b284 -s ours am: 14b17d2fb1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ide10d75b623cdb0bc7047529ce0c79e57a18120f

[automerger skipped] DO NOT MERGE: Remove pairing on incoming bond request am: 85b5df1d0d am: ab50a6b284 -s ours

am skip reason: Change-Id I048b7b142e3fe2096cf1a9aa2931c175fa52cd45 with SHA-1 e29c52cfda is in history

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

Change-Id: I01231f49767b1f5e54f43bf119e410a147198033

DO NOT MERGE: Remove pairing on incoming bond request am: 85b5df1d0d

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

Change-Id: Icf0c4b744a56a06669fea1effd45c898063a4631

[automerger skipped] DO NOT MERGE: Remove pairing on incoming bond request am: e29c52cfda -s ours am: 594c470d27 -s ours am: 230d3180fb -s ours am: 61ceb1cf17 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id3cc3bff887d7d5a3fb7a0bd0e49462e9555feb2

[automerger skipped] DO NOT MERGE: Remove pairing on incoming bond request am: e29c52cfda -s ours am: 594c470d27 -s ours am: 230d3180fb -s ours

am skip reason: Change-Id I048b7b142e3fe2096cf1a9aa2931c175fa52cd45 with SHA-1 21e580de3b is in history

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

Change-Id: I2a7bfd5c6ee7f01688ea3c680e29d692ed9cc56e

[automerger skipped] DO NOT MERGE: Remove pairing on incoming bond request am: e29c52cfda -s ours am: 594c470d27 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I57e23a03647c13e6ffbb2e42b016e2fbb20c516f

[automerger skipped] DO NOT MERGE: Remove pairing on incoming bond request am: e29c52cfda -s ours

am skip reason: subject contains skip directive

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

Change-Id: I289b55466f022e0ee4422a142427014146eeb936

Remove pairing on incoming bond request am: 21e580de3b am: 73dd59984c am: c038497ddd

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

Change-Id: I61ab971764bdb4b58cec261428c5bb8c2f3ed9b0

Remove pairing on incoming bond request am: 21e580de3b am: 73dd59984c

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

Change-Id: If7636b869c35d1313637ca8200e36d13778832e3

Remove pairing on incoming bond request am: 21e580de3b

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

Change-Id: I8eab6881fc28cd96fc7c7975d4ffb4bf75626eb2

HF_CLIENT: Upgrade version from 1.6 to 1.7

In HFP client version 1.7, mandatory S4 setting for eSCO
CVSD coding is introduced. S4 setting takes parameters
as maximum latency = 12msec and retransmission effort = 2.

Cherrypicked from https://r.android.com/1212759

Test: ./run_unit_tests.sh net_test_btif_hf_client_service
Test: ./run_unit_tests.sh net_test_hf_client_add_record
Bug: 146090794
Tag: #feature

Change-Id: Ia450b4c237f130021511efb4795d4b2a98892cef

Merge "Fix: fragment packets" into rvc-dev

Fine tune btif config mechanism to limit the number of section in bt config cache and improve the bt config clone performance

* Bt config cache will grow bigger and bigger without limitation and
cause many Bluetooth stability issues
* Do not clone the whole config cache before writing config cache
into file, clone paired devices section instead.
* Implement BtifConfigCache class to handle bt devices config add,
remove, paired, unpaired,..etc.

Bug: 143515989
Test: 1. Add BtifConfigCacheTest unit tests to test bt config cache
setup, paire with a new devices, unpaire with a devices, remove the
sections with specific key.
2. Checking the paired devices information still existed in settings
after Bluetooth disable or device reboot.
3. Checking the paired devices information still saved in btif_config
file after Bluetooth disable and device reboot.
4. Remove btif_confing files and enable Bluetooth, checking the
btif_config file can be created and included adapter information
normally.
5. Checking the paired devices information be clean in btif_config
file after device factory reset
6. keep BLE scanning, then pair with a bluetooth device, connect a
bluetooth device, disable Bluetooth, checking the function work
normally.
Tag: #stability

Merged-In: Ide1ba1b6daaf9d102ab96976cbf28e65031423d0
Change-Id: Ide1ba1b6daaf9d102ab96976cbf28e65031423d0
(cherry picked from commit 098212937ba1fd16c7630659d98af877c16f10f3)

Fix: fragment packets

Small overflow window

Bug: 147227320
Test: net_test_hci_fragmenter_native

Merged-In: I3b7b4cbcbd292ed6fbbf9eacf3be66cf7c4120cc
(cherry picked from commit 8e2aa03a846bad0ff8c701a8a2468c1442f17b7a)
Change-Id: Ie64e1e107966c8b0d187739777d3abfe199c66bc

LruCache: Improve efficieny and ease of use of APIs

* Add a Find() function that returns the pointer to the value associated
  with a key, further changes to the value using that poitner does not
  warm up the cache
* Remove eviction callback, but instead return an optional evicted node
  when Put() evicts a cold node. This prevents potential deadlock when
  calling LruCache methods in the callback
* HasKey() is not zero-copy
* Get() calls Find()
* Add unit tests for these new features
* Modify MetricIdAllocator to use these new features

Bug: 143515989
Test: atest --host bluetooth_test_common
Change-Id: I9071c86a9041e5c95b349824889ccedf9f9c18dc
Merged-In: I9071c86a9041e5c95b349824889ccedf9f9c18dc
(cherry picked from commit 42f8c2b972c3fb39a9b1e3fbff3fcb3a0060c33e)

Osi: Implement Has/Get/Set methods for section_t and config_t

* Implement convenience methods so that users don't have to loop
through them manually

Bug: 143515989
Test: atest --host net_test_osi:ConfigTest
Change-Id: I570a49bec9496409ba60f8223c58c9e642b41c1a
Merged-In: I570a49bec9496409ba60f8223c58c9e642b41c1a
(cherry picked from commit ea96adb18201c603a65b49583281a372a830af69)

LruCache: Allow Get to take nullptr

* When nullptr is given, copy of item is omitted

Bug: 143515989
Test: atest --host bluetooth_test_common
Change-Id: If5405611e8a32709bf0bf18f416d17adbd07b5ea
Merged-In: If5405611e8a32709bf0bf18f416d17adbd07b5ea
(cherry picked from commit 44229e65df659fa78ab04dfafea65f756ac9b18f)

Merge "Don't query for metadata on playing status" into rvc-dev

DO NOT MERGE: Remove pairing on incoming bond request

Bug: 150156492
Tag: #security
Test: Bond two devices, forget from one device and reconnect
Change-Id: I048b7b142e3fe2096cf1a9aa2931c175fa52cd45
(cherry picked from commit 13f409ad3a2423b06af7a7f1a9b06fb06c8820a7)
Merged-In: I048b7b142e3fe2096cf1a9aa2931c175fa52cd45

Remove pairing on incoming bond request

Bug: 150156492
Tag: #security
Test: Bond two devices, forget from one device and reconnect
Change-Id: I048b7b142e3fe2096cf1a9aa2931c175fa52cd45
Merged-In: I048b7b142e3fe2096cf1a9aa2931c175fa52cd45
(cherry picked from commit 13f409ad3a2423b06af7a7f1a9b06fb06c8820a7)

Don't query for metadata on playing status

These removed lines of code were for a problem that no longer seems to
exist with other phones. It was a band-aid at best, having us pull
metadaa on 'playing status' when a phone really should have just been
sending the update to us anyway. Pulling metadata here causes a bad user
experience with cover artwork where the new metadata is interpreted as a
track change in Java land and cover artwork can be redownloaded. This
happens primarily with non-database aware players after a BIP reconnect
where we're guarenteed nothing about the handle we receive.

Tag: #compatibility
Bug: 158232844
Test: atest BluetoothInstrumentationTests
Merged-In: Idb88e7c1e1553319cb26eba2c18e3cd2bbd552cc
Change-Id: Idb88e7c1e1553319cb26eba2c18e3cd2bbd552cc

RootCanal: Use a state machine in ScriptedBeacon

  Add indication for ble add playback completion
  bt HCI: Make sure the device numbers match
  Clean up static variables in scripted beacon
  Clean up logs in scripted beacon

Test: boot cuttlefish and check logcat
Tag: #gd-refactor
Bug: 154491371
Bug: 158019041
(cherry picked from commit 79f168b7f3b03722cf2d0bb5ee97258824dc3832)
(cherry picked from commit 1c66bdaa38c46e859b66f8cc055993c5f0e7f5a1)
(cherry picked from commit 82656e9682e9de7596b7327618cf680936f34589)
Change-Id: I7f54ecef4ba08acc33b9d773b02b8428ca91a415
(cherry picked from commit 53c68dba78cc8f746c93e3db062ef358a976f0bf)
Merged-In: I7f54ecef4ba08acc33b9d773b02b8428ca91a415

GAP: Use proper page scan rep mode for connection

Issue: Page time out seen when user initiated pairing from LE scan response

Steps to reproduce
==================
Steps:
1. Turn on BT
2. inquiry any dual mode device
3. Initiate pairing (only LE scan response received but br/edr
inquiry response not received)

Actual Result:
Remote name request or create connection got page timeout some times

Expected result:
Remote name request and create connection should be successful

Root Cause:
If user finds only LE scan response for dual mode devices, then stack
treats it as dual mode based on br/edr not supported bit. If pairing
initiated from LE scan response, then stack initiates RNR and ACL connection
on br/edr transport with wrong page scan response from LE inquiry database,
it leads to page time out.

Fix:
Use page scan response from inquiry data base if br/edr inquiry response
received, else use default page scan response R1 in RNR and create connection.

Test: Follow steps above
Bug: 154286616
Change-Id: I281ebc6d0e67d88c30328cb67df7f28793f354c1

RootCanal: Use GD defaults to define OS_ANDROID

When OS_ANDROID is defined logs go to logcat.
When OS_ANDROID is not defined logs to stderr.

Bug: 157706301
Test: cert/run --host
Tag: #gd-refactor
Change-Id: I3e735a4716fbc35a3d66e03909fdbf905436d285
Merged-In: I3e735a4716fbc35a3d66e03909fdbf905436d285

Merge "Enable bitpool sanity checks" into rvc-dev

btif_config: Fix pointer to freed memory

We change the scope of our 'string' declaration so the contents
are still in scope when we use a pointer to them. Previously,
the contents were out of scope when we referenced them through
a pointer.

Bug: 148758680
Test: TreeHugger
Change-Id: Ib0aa689bf4547d079b77965d958cc382ba0276e6

Enable bitpool sanity checks

Enable bitpool sanity checks to run all the time, not just in debug
mode.

Tag: #security
Test: sbcdecoder_fuzzer
Bug: 146398979
Change-Id: Iff58305cd18de35e37290f0c09fba01ee14e787a

NIAP: Add a map to store the LTTKM

When do pairing, the set_encrypt_key_or_remove_key will be later than
get_key due to they are in different thread. Use a map to store them and
will check whether the key exist in map. If no, will get the key from
the JAVA bluetoothKeystore.

Bug: 148758680
Test: m
Change-Id: I044b11a231c6f65978019ce6092657c1bdd814d1
Merged-In: I044b11a231c6f65978019ce6092657c1bdd814d1

NIAP: Use bluetooth keystore to encrypt/decrypt LTTKM.

Bug: 148758680
Test: m
Change-Id: Ic1e4ddd186d900c5058f40e8eeef500ce23087b7
Merged-In: Ic1e4ddd186d900c5058f40e8eeef500ce23087b7

NIAP: implement bluetooth keystore interface.(2/2)

Bug: 148758680
Test: m

Change-Id: I89f782039123d1deac173d13670de4d9dae5252a
Merged-In: I89f782039123d1deac173d13670de4d9dae5252a

NIAP: Add new argument to determine config checksum check result.(2/4)

Bug: 148758680
Test: m
Change-Id: I07eb90a144e172212c7a1a55ef200111efd297e0
Merged-In: I07eb90a144e172212c7a1a55ef200111efd297e0

NIAP: Add keystore.proto for java layer usage.

Add keystore.proto for java layer usage.

Bug: 148758680
Test: m
Change-Id: I8fecbcdc46eb12336c9fd1fa1e2166df80d80f19
Merged-In: I8fecbcdc46eb12336c9fd1fa1e2166df80d80f19

Merge "BluetoothMetrics: Fix LRU eviction callback bug" into rvc-dev

BluetoothMetrics: Fix LRU eviction callback bug

Test: atest bluetooth_test_common
Bug: 156504089
Tag: #stability
Change-Id: I594070a0dc1c33bd8f971bb8a7752fd317872a55
Merged-In: I594070a0dc1c33bd8f971bb8a7752fd317872a55
(cherry picked from commit 184414edd1a0851892865241d9287ca0d808b54e)

Support for reading playback file in scripted beacon

Bug: 154491371
Tag: #feature
Test: Manual test on cuttlefish
Test: gd/cert/run --host
Change-Id: Ie0ce31796a0c28826002b0677d27e5db075dde6d

RootCanal: Add a scripted beacon for testing

Bug: 154491371
Tag: #feature
Test: Scan for devices
Test: gd/cert/run --host
Change-Id: I3354d621d4253d051eb7b814de8d7889dcf99f64

Allow Java-land to request current track metadata through JNI

AVRCP Targets are not supposed to give image handles over with metadata
until an AVRCP BIP client connects from a particular controller. Because
this connection can happen any time and there's nothing forcing a target
to send us a track changed notification to inform us of the new handle,
the best thing we can do to work with all devices is to request it when
we connect on BIP. Otherwise, we risk a race condition between the BIP
connection and any amount of track changed notifications that might
happen organically. Our JNI doesn't current support requesting current
track metadata.

This change adds/implements a get_current_track_metadata() method to the
JNI. This, paired with a change in /packages/apps/Bluetooth/, fixes the
above mentioned race condition and keeps us from missing out on possible
cover art image handles.

Bug: 152655644
Test: Build, flash, test with AVRCP target cover art devices
Change-Id: I9d1f28068b4fded61d5336da8d864fbd9ef34f98
Merged-In: I9d1f28068b4fded61d5336da8d864fbd9ef34f98

Merge "Check search state when cancel read remote name procedure" into rvc-dev

service: A2DP source callback to query the preferred codec

In order to apply user's preferred codec while reconnecting, we need a
callback method to talk to Bluetooth stack whether the mandatory codec
has higher priority than others. This change implements a dummy method
in the fluoride service, so is working with the stack.

Bug: 134131114
Bug: 147572898
Test: bluetoothtbd_test
Change-Id: Ib99cf12eba85450526e22723d1509405469c2ebc
Merged-In: Ib99cf12eba85450526e22723d1509405469c2ebc
(cherry picked from commit 3254942410f182533675645392d7f72d14bf7543)

A2DP: Don't select disabled optional codecs when local SRC reconnecting

When local SRC is establishing a connection, the Bluetooth stack follows
those default priorities to choose a codec, and A2dpService needs to
judge again after this connection up event. If a user prefers the
mandatory codec, the peer state is OPEN -> RECONFIG -> OPEN which
is redundant but lousy. Since codecs preference is saved at the
upper-layer, this change queries the mandatory codec, and raises
the priority for more preferred codec while reconnecting from local.

Bug: 134131114
Bug: 147572898
Test: Local A2DP initializes connections
Change-Id: I110ffa463dd4c9ec62e18e1843b5aebc84d73093
Merged-In: I110ffa463dd4c9ec62e18e1843b5aebc84d73093
(cherry picked from commit 2fda2f0e415b2da9e7d5201bf8089492db88e73a)

Set min_sdk_version to be part of mainline modules

Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 152655956
Test: m
Merged-In: Ifb9e0d4cd57a0e8212341cf493cd9fb20d0e264c
Change-Id: Ifb9e0d4cd57a0e8212341cf493cd9fb20d0e264c
(cherry picked from commit da09207b693706b0ed5cc2fef65401dbe972925e)

Merge "Revert "Add min_sdk_version:R to updatable apexes"" into rvc-dev

Check search state when cancel read remote name procedure

Application may call cancel_discovery when the stack is doing
create_bond. The bonding process fails, because cancel_discovery
causes to cancel remote name request procedure.

Bug:154074383
Test: CtsVerifier->Bluetooth Test->Bluetooth HID Host
Change-Id: Icadf9abe342fffdf06b9623fb5c7e6de05a337bc
(cherry picked from commit e3f9fe7425705dc819a638c158ad9f87cb2bd1eb)

Revert "Add min_sdk_version:R to updatable apexes"

This reverts commit 971de2aa7e2227092051b32b3a805de3020ab74c.

Reason for revert: the BT apex is not yet updatable
Bug: 152655956
Test: m nothing
Change-Id: I91c516d4ce950ff2f70a1536152bac0cf878e919

Change-Id: I784c3ea6c6ebc95c6fce70dac76b90afc7d0bff6

Update call of HAL 1.1 bluetooth HCI initialization

Updates initialization call if HAL for bluetooth is 1.1

Bug: 144413056
Change-Id: I7d8ac8af74303d15f83c3dbaea784ec1ad7d54fa

Merge "NIAP: remove keystore related code for now." into rvc-dev

Merge "Fix bugprone-use-after-move warnings" into rvc-dev

Into the BG connection when the HA disconnects from remote side

In some cases, it will add the random address into the BG connection
after the HA device is connected via a random address. Then the
ble_bgconn will add the public address into the controller white list if
the random address has the public address. Finally, it will get a second
connection handle with the public address on the same HearingAid device.
The patch changes the behavior that when the HearingAid device
disconnects from the remote side, add the device into the BG connection.

Bug: 152517031
Test: 1.run unit test.
2.Forget/Repair HearingAid device from Bluetooth UI.
3.Disconnect/Reconnect HearingAid device from Bluetooth UI.
4.HearingAid device power off/on, check them can reconnect.

Change-Id: Id491faeaddaa32bbea0c88c7f0563d299f7f33f8
Merged-In: Id491faeaddaa32bbea0c88c7f0563d299f7f33f8

Fix bugprone-use-after-move warnings

Bug: 150783499
Test: TreeHugger
Change-Id: I004a4084f2d7ab1a1f2908e930a17527d3b0d0bf
Merged-In: I004a4084f2d7ab1a1f2908e930a17527d3b0d0bf

btsnoop: Fix btsnoop_net runs unexpected

By default, btsnoop_net was disabled using "BT_NET_DEBUG" macro.
But, it enabled actually and manages socket connection for sending
btsnoop logs. The reason was, TRUE/FALSE macro were not defined.
This fix including "bt_types.h" to work macro properly.

Bug: 154647071
Test: Turn on btsnoop logging and observe btsnoop_net runs or not.

Signed-off-by: KimJeongYeon <jeongyeon.kim@samsung.com>
Change-Id: I595d06510170d27fbf81068fa7ce8769eabd0992
Merged-In: I595d06510170d27fbf81068fa7ce8769eabd0992
(cherry picked from commit bc6072c798a597624bda3e999c3432d384d851a0)

Merge "Send the only song in queue as now playing song when get item attributes of now playing" into rvc-dev

A2DP: Fix integer sanitizer in SBC encoder

There were three potential integer overflow within SBC software encoder:

* embdrv/sbc/encoder/srce/sbc_packing.c:144:38: runtime error: unsigned
  integer overflow: 4294967231 + 8192 cannot be represented in type
  'unsigned int'
* embdrv/sbc/encoder/srce/sbc_packing.c:147:9: runtime error: signed
  integer overflow: 37932 * 65535 cannot be represented in type 'int'
* embdrv/sbc/encoder/srce/sbc_packing.c:147:9: runtime error: signed
  integer overflow: 178177545 + 2146959360 cannot be represented in type
  'int'

They were caught by the integer sanitizer, and

1. (*ps32SbPtr >> 2) is either greater than 0xFF00,0000 or less than
   0x007F,FFFF, so just cast to a signed integer explicitly.
2. Positive integer between 0x8000,0000 ~ 0xFFFF,FFFF can't be
   represented in type 'int', but is still feasible in 32-bits.
3. s32OutLow is the lower byte of a 64 bits integer, but can't have the
   carry values which is only for the higher byte.

This change gives the compiler a signed 64-bits variable, and trusts it
to do better optimization at multiplication.

Bug: 153402404
Test: make sure there are no integer sanitization errors.
Change-Id: I5046a42f9927c1aa7c25da2828c4f921ba7a5021
Merged-In: I5046a42f9927c1aa7c25da2828c4f921ba7a5021
(cherry picked from commit a42db783434da238e4daade95ce2adb1bca0f138)