summaryrefslogtreecommitdiff
path: root/system
AgeCommit message (Collapse)Author
2022-09-02Bluetooth: Fix build with Clang 14HEADtachibanaalk3pInjection
Output: In file included from vendor/qcom/opensource/commonsys/packages/apps/Bluetooth/jni/com_android_bluetooth_a2dp_sink.cpp:22: packages/modules/Bluetooth/system/include/hardware/bt_av.h:132:15: error: anonymous non-C-compatible type given name for linkage purposes by typedef declaration after its linkage was computed; add a tag name here to establish linkage prior to definition typedef struct { ^ btav_a2dp_codec_config_t packages/modules/Bluetooth/system/include/hardware/bt_av.h:147:3: note: type is not C-compatible due to this member declaration std::string ToString() const { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ packages/modules/Bluetooth/system/include/hardware/bt_av.h:261:3: note: type is given name 'btav_a2dp_codec_config_t' for linkage purposes by this typedef declaration } btav_a2dp_codec_config_t; ^ 1 error generated. Change-Id: I6a1ae5cbcaea50312091f3f42bc9d8184206fab4
2022-07-26Merge TP1A.220624.020Deyao Ren
Change-Id: I357db3da652d8ce93bb26a00d0f123fae1b7c64c
2022-07-07Do resolving list operations via handlerChienyuan
Bug: 226711441 Test: gd/cert/run Tag: #refactor Change-Id: I74a97424e93461372762cdf4a4b2bc8b9f83684e Merged-In: I74a97424e93461372762cdf4a4b2bc8b9f83684e (cherry picked from commit 7332df884aff7b20d36892db5f0bd3438436b6f8) (cherry picked from commit 1642ede3e6df42ff8e1322e98145bfbeb76912ed) Merged-In: I74a97424e93461372762cdf4a4b2bc8b9f83684e
2022-07-01Revert "Revert "Immediately execute instead of queueing request ..."Rahul Sabnis
Revert submission 19019716 Reason for revert: b/237352700 Reverted Changes: I8e37ac142:Revert "Queue discovery and device inquiry while b... Ic8642a39f:Revert "Make SDP and inquiry request dequeue and e... I06eb6d806:Revert "Immediately execute instead of queueing re... Bug: 237352700 Test: Manual Change-Id: I56db49540b139ae0d8d1e5819d348d28e432a5e3 (cherry picked from commit bba6b41fc00f99fa4e548aa7d32bce30e3ebddce) Merged-In: I56db49540b139ae0d8d1e5819d348d28e432a5e3
2022-07-01Revert "Revert "Make SDP and inquiry request dequeue and execute..."Rahul Sabnis
Revert submission 19019716 Reason for revert: b/237352700 Reverted Changes: I8e37ac142:Revert "Queue discovery and device inquiry while b... Ic8642a39f:Revert "Make SDP and inquiry request dequeue and e... I06eb6d806:Revert "Immediately execute instead of queueing re... Bug: 237352700 Test: Manual Change-Id: I52e9d3828cbd785dfb816541cf19e7b7a8f2bff8 (cherry picked from commit 21e82985253f1a12a3b62d793990df7a3b0e3df1) Merged-In: I52e9d3828cbd785dfb816541cf19e7b7a8f2bff8
2022-07-01Revert^2 "Queue discovery and device inquiry while bonding"Rahul Sabnis
3da8e931820f59d34e2f8b81e87d002cec809eda Bug: 237352700 Test: Manual Change-Id: I4699b7d73383b8b09ad1e3292d9dc2673f145736 (cherry picked from commit dc8078abe546202e9ad91e3c7af5baca4b42861c) Merged-In: I4699b7d73383b8b09ad1e3292d9dc2673f145736
2022-06-30Revert "leaudio: Make LE Connection Interval a multiple of SDU_Interval"Jack He
This reverts commit fa97f8d060ca426be09f679f0a62b1d2f86152db. Reason for revert: 60ms is above the maximum recommended initial connection interval, slow down the encryption procedure Test: testplans/1161726 Bug: 233417283 Merged-In: I0c117718f391b9ecf53fb263253eff4b7b59e8f1 Change-Id: I0c117718f391b9ecf53fb263253eff4b7b59e8f1 (cherry picked from commit cbf9350401bccf86b9a640176b683808eed0192c) (cherry picked from commit a312a8157bd48cd27945a226fd3dac7c3a55089e) Merged-In: I0c117718f391b9ecf53fb263253eff4b7b59e8f1
2022-06-29Merge TP1A.220624.003Deyao Ren
Change-Id: I64d825a1bb7108a126ae036a1018bf740d724750
2022-06-29GATT: Disable notifications when disconnectingJakub Pawlowski
Currently, if we receive notification after disconnection, but before closing the client, stack would notify upper layers that connection is avaliable, and sned notifications to Java. This can be troublesome i.e. for Heart Rate Monitors, that send notifications very often, and can prevent apps from closing properly. Bug: 231818024 Test: connect to HRM with more than one application, close/disconnect multiple times Merged-In: I1e9ca7ba6379322f7321b77a2ea92c96c799a452 Change-Id: I1e9ca7ba6379322f7321b77a2ea92c96c799a452 (cherry picked from commit 666f247f1dbe53a55caf3a8b979c859fe47b32aa) (cherry picked from commit f65b7a508a264aa1a6383d1d70fcfba44b624919) Merged-In: I1e9ca7ba6379322f7321b77a2ea92c96c799a452
2022-06-29gatt: Fix incorrect write to the descriptor.Łukasz Rymanowski
This patch fixes regression after https://android-review.googlesource.com/q/topic:gatt-racecondition-fix In case of GATT Write error to descriptor or characteristic, the value which was tried to be written is zeroed in the onWriteDescriptor/Characteristic callback. This cause an issue in following use case: 1) Application writes descriptor on unencrypted link to characteristic which requires authentication 2) Remote device response with an error insufficient authenthication 3) Android repeats write descriptor with new authenthication requrements with the descriptor value taken from the onWriteDescriptor callbac - the one which was zeroed. This result in try to write invalid value to the descriptor This patch make sure that value in the callback is always the one which was tried to write, no matter of status. Bug: 235756799 Test: atest BluetoothInstrumentationTests Tag: #stability Merged-In: Icd18b95a3c44c082117d035cdf25961938de829d Change-Id: Icd18b95a3c44c082117d035cdf25961938de829d (cherry picked from commit 24f45364768c19bdb0222ce836fce7531d5182de) (cherry picked from commit b64432cfb2505f57337061c2047a485a34f9622f) Merged-In: Icd18b95a3c44c082117d035cdf25961938de829d
2022-06-24Move user file along to the new package nameWilliam Escande
Repro step: * Flash old build * Pair device * Change it's metadata: * Change connection_policy * Change Volume * Change phone_access * build and flash without wipe * observe device metadata Test: Repro step above Bug: 234063703 Ignore-AOSP-First: will be picked later Change-Id: I51f54f2fe8a91ee4ee28e1e58494e596510ebb55 (cherry picked from commit b94e4d791f474ec464ebd09f47468e9f89b645e9) Merged-In: I51f54f2fe8a91ee4ee28e1e58494e596510ebb55
2022-06-23Merge "HAL: Avoid FATAL log on expected transaction status" into tm-devZach Johnson
2022-06-23Merge "Change Bluetooth apex mountpoint" into tm-devTreeHugger Robot
2022-06-23Always create connection when hci status SUCCESSChris Manton
Bug: 232195935 Test: gd/cert/run Tag: #refactor Ignore-AOSP-First: cherry-pick Merged-In: Ie7b6821aee38812255545b484aef7f6a6994cc85 Change-Id: Ie7b6821aee38812255545b484aef7f6a6994cc85
2022-06-22Merge "Fix flakiness in LeAdvancedScanningTest lost test" into tm-devChristine Hallstrom
2022-06-22Fix flakiness in LeAdvancedScanningTest lost testChristine Hallstrom
Wait for scan result match found event to ensure scanner is started before stopping advertiser to generate lost match event. Otherwise the scanner may not have started before advertising stops on the cert side and the test may fail to catch it. Bug: 232424520 Test: gd/cert/run --device --clean --sl4a LeAdvancedScanningTest.test_scan_filter_lost_random_address_with_irk --repeat=10 Ignore-AOSP-First: Fixing flakiness on tests needed for presubmit on tm-dev. Change-Id: Id7957d989ffc95c7c869132d1f059957f5720fe2
2022-06-22Change Bluetooth apex mountpointWilliam Escande
Apex name has been changed to com.android.btservices Changing mount point accordingly Bug: 235892590 Test: Flash / boot bt / look logs & pair a device Ignore-AOSP-First: Apex only on tm-dev Change-Id: Id4e3410c00a9afd4c3c99af18c55e34bc89b4a30
2022-06-22HAL: Avoid FATAL log on expected transaction statusJosh Wu
Ignore-AOSP-First: QPR update Bug: 232865497 Tag: #stability Test: atest BluetoothInstrumentationTests Change-Id: I945f8c4820c50bd8712b77e09d5743a3588afdfb
2022-06-22Merge changes I8e37ac14,Ic8642a39,I06eb6d80 into tm-devTreeHugger Robot
* changes: Revert "Queue discovery and device inquiry while bonding" Revert "Make SDP and inquiry request dequeue and execute more comprehensive and" Revert "Immediately execute instead of queueing request for LE service discovery"
2022-06-21Revert "Queue discovery and device inquiry while bonding"Rahul Sabnis
This reverts commit d7762e71c6ea5837228325d38d802f598f9b1477. Tag: #feature Bug: 230277335 Test: Manual Ignore-AOSP-First: Need to land change for Android T Change-Id: I8e37ac1424f3c569e201b4a4c1f668a0c0a2cd54
2022-06-21Revert "Make SDP and inquiry request dequeue and execute more comprehensive and"Rahul Sabnis
This reverts commit 6b77ebbf364c2c9d83c76a965755df8b7f5894db. Tag: #feature Bug: 230277335 Test: Manual Ignore-AOSP-First: Need to land change for Android T Change-Id: Ic8642a39f97cab2045b57c1da6a019e0f43c87fc
2022-06-21Revert "Immediately execute instead of queueing request for LE service ↵Rahul Sabnis
discovery" This reverts commit b954aa6e48e93b3416706809981ce2c27735663d. Tag: #feature Bug: 230277335 Ignore-AOSP-First: Need to land change for Android T Test: Manual Change-Id: I06eb6d8066411fc6c2ad894a2d9196faf510a599
2022-06-17Merge changes I6025b029,Ibe703eb9 into tm-devJack He
* changes: Remove legacy hci role handler and add back role reject list Add visteon carkit to interop role switch db
2022-06-17Merge "ASHA: do service search after service discovery" into tm-devTreeHugger Robot
2022-06-17Remove legacy hci role handler and add back role reject listChris Manton
Bug: 235838914 Test: gd/cert/run Tag: #refactor BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines Ignore-AOSP-First: cherry-pick Merged-In: I6025b0291384d69503aeac5f6da75931d16f75b2 Change-Id: I6025b0291384d69503aeac5f6da75931d16f75b2
2022-06-17Add visteon carkit to interop role switch dbChris Manton
Bug: 235838914 Test: gd/cert/run Tag: #refactor BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines Ignore-AOSP-First: cherry-pick Merged-In: Ibe703eb980144c2e31312f2fefe1e113a708175a Change-Id: Ibe703eb980144c2e31312f2fefe1e113a708175a
2022-06-17ASHA: do service search after service discoveryweichinweng
From the ASHA design, will do service search for the ASHA profile from SDP after encryption successful. On this time, the service search will fail and no responed if the service discovery is running. Then the ASHA profile connection is broken due to service search no response. This patch make sure the ASHA can do service search after service discovery. Tag: #feature Bug: 235913388 Test: manual Ignore-AOSP-First: cherry-pick Merged-In: I78e8b9c1cc78fb129d7872c98e902cc71b5a5f16 Change-Id: I78e8b9c1cc78fb129d7872c98e902cc71b5a5f16
2022-06-17GD-SL4A: Add repeated connection test for background connectionsJack He
* Add test_autoconnect_gatt_without_pairing_and_disconnect_quickly to check if GATT is tear down fast enought after last client unregisters * Add test_autoconnect_gatt_twice_with_random_address_without_pairing to check if we can make subsequent GATT connections * Both tests are for random address that are unbonded Bug: 232258524 Test: gd/cert/run --sl4a GattConnectLowLayerTest.test_autoconnect_gatt_twice_with_random_address_without_pairing Test: gd/cert/run --sl4a GattConnectLowLayerTest.test_autoconnect_gatt_without_pairing_and_disconnect_quickly Test: gd/cert/run --sl4a GattConnectLowLayerTest.test_disconnect_autoconnect_without_close Test: gd/cert/run --sl4a GattConnectLowLayerTest.test_autoconnect_without_proactive_disconnect Test: gd/cert/run --sl4a GattConnectLowLayerTest.test_autoconnect_without_proactive_disconnect_repeatedly Tag: #bug-fix Merged-In: Iad813154d87c4bb18e7762b8a4c5ef414979b8e8 Change-Id: Iad813154d87c4bb18e7762b8a4c5ef414979b8e8 (cherry picked from commit 2a2172d479e3a23a208091289b25c3bc1dc251f4)
2022-06-17GATT: Add more debug logs to help with debuggingJack He
Bug: 232048916 Tag: #logging Test: gd/cert/run --sl4a Merged-In: If5a2970aa7b1ebdb85e59f2f9dd494f0837d1379 Change-Id: If5a2970aa7b1ebdb85e59f2f9dd494f0837d1379 (cherry picked from commit 4db821d819af267a8f6d96c1161f8effd7c1fa98)
2022-06-17Merge "Race condition handling when connection happens after cancel" into tm-devTreeHugger Robot
2022-06-17Merge "Remove device from background list when initiating disconnect" into ↵TreeHugger Robot
tm-dev
2022-06-17Merge "Test: Stability improvements on bluetooth_stack_with_facade" into tm-devTreeHugger Robot
2022-06-17Merge changes Idbb12b55,Id1e4cb30 into tm-devTreeHugger Robot
* changes: Test: Further stability improvements to ACL tests SL4A: Throw exception when test fails and clear paired devices
2022-06-17Merge "Test: Zip dynamic libraries and push to device if not present" into ↵TreeHugger Robot
tm-dev
2022-06-16Merge TP1A.220611.001Jose Galmes
Change-Id: I5bff987f996d599e6bdb0f22d1eec680b5d7d6c1
2022-06-16Merge "Ensure repeated connections are captured" into tm-devJack He
2022-06-16Merge "Revert "Disable sniff mode for Phonak device"" into tm-devTreeHugger Robot
2022-06-16Merge "Do not perform SSR when avdtp start" into tm-devTreeHugger Robot
2022-06-16Race condition handling when connection happens after cancelChris Manton
Bug: 232258524 Test: gd/cert/run Tag: #refactor BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines Ignore-AOSP-First: cherry-pick Merged-In: I7a57eadc6186746fc400742bf8c7adea8965e8de Change-Id: I7a57eadc6186746fc400742bf8c7adea8965e8de
2022-06-16Remove device from background list when initiating disconnectChris Manton
Bug: 232258524 Test: gd/cert/run Tag: #refactor BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines Ignore-AOSP-First: cherry-pick Merged-In: I211c7bc2b38dc9d75a4be087a99e0b2ab8e22c17 Change-Id: I211c7bc2b38dc9d75a4be087a99e0b2ab8e22c17
2022-06-16Test: Stability improvements on bluetooth_stack_with_facadeJack He
Call std::map::erase before std::map::emplace * std::map::emplace does not replace existing value if the key already exists. The newly constructed element will be destroyed immediately if there already is an element with the key in the container. Hence, if we want to emplace a new value, we should always erase the old one or use std::map::insert_or_assign * If the value is move-only, insert_or_assign may not work Avoid shutting down gRPC server in signal handler * See https://github.com/grpc/grpc/issues/24884 * Create a separate shutdown thread for this purpose Make sure all facade server values are deleted when exit * To avoid memory leak Do not call server->Wait() on a deleted gRPC server * Instead, use a std::uniptr to hold the server object until the wrapper class is freed Bug: 228619929 Bug: 235872679 Bug: 232048916 Ignore-AOSP-First: cherry-pick Merged-In: Idf64df4ca61e0820ec9d48fdc9b0d191ddf0d352 Change-Id: Idf64df4ca61e0820ec9d48fdc9b0d191ddf0d352
2022-06-16Test: Further stability improvements to ACL testsJack He
* erase items before calling std::map::emplace in le_acl_facade * add more logging to LE and classic ACL facades * reduce GrpcEventQueue's wait time from 500ms to 100ms so that it can be terminated faster * force a wait of 100ms after closing gRPC streams in Python Bug: 228619929 Bug: 235872679 Bug: 232048916 Test: gd/cer/run --sl4a Ignore-AOSP-First: cherry-pick Merged-In: Idbb12b55db96b00bb695c54af1fd0efcc1f65841 Change-Id: Idbb12b55db96b00bb695c54af1fd0efcc1f65841
2022-06-16SL4A: Throw exception when test fails and clear paired devicesJack He
* Return False no longer makes the test fail in mobly we should raise exception instead * Clear paired devices before tests so that they do not interfer with later tests Bug: 232048916 Tag: #test Test: gd/cert/run --sl4a_sl4a --clean Merged-In: Id1e4cb30e28a13203848cb5c406ecb784fe2315c Change-Id: Id1e4cb30e28a13203848cb5c406ecb784fe2315c (cherry picked from commit 19d1d76cb88fb9c70fad473d47c9e29fb857d75b)
2022-06-16Test: Zip dynamic libraries and push to device if not presentJack He
* Bluetooth mainline modules keeps its own copies of dynamic libraries * Hence now GD cert binaries have to keep another copy when running Test: gd/cert/run --sl4a Bug: 232048916 Tag: #gd-refactor Merged-In: I716b47f6b808cd42b0713f55ba08544011652730 Change-Id: I716b47f6b808cd42b0713f55ba08544011652730 (cherry picked from commit d500fed07edc0fdbb8248681247e32a4cefa92ef)
2022-06-16Ensure repeated connections are capturedChris Manton
std::map::emplace does not replace existing value if the key already exists. The newly constructed element will be destroyed immediately if there already is an element with the key in the container. Bug: 235872679 Bug: 232258524 Tag: #test Test: gd/cert/run --sl4a --clean Ignore-AOSP-First: cherry-pick Merged-In: I340b723e805c0b94128bf6665690571f09dc9529 Change-Id: I340b723e805c0b94128bf6665690571f09dc9529 (cherry picked from commit 16b4e99141a42a63e9255cd30cdaca39e34e3169)
2022-06-16eatt: Fix missing tx mtu setŁukasz Rymanowski
We use EATT only for LE and this fix incorrect value provided to the EATT implementation as peer_mtu. It could result on incorrect GATT fragmentation, when EATT was created by remote device. Tag: #feature Test: atest BluetoothInstrumentationTests Bug: 235783869 Change-Id: I4dde8eeb60ab0b045960a81718b428acbc0c34f7 Merged-In: I4dde8eeb60ab0b045960a81718b428acbc0c34f7 (cherry picked from commit a9ea471596ca75d1225349fa89f4bdee305cc18e)
2022-06-15Merge "Fix Nullptr access in sdp" into tm-devTreeHugger Robot
2022-06-15Merge "Store and report the union of SDP and BLE UUIDs." into tm-devJack He
2022-06-14Store and report the union of SDP and BLE UUIDs.Qasim Javed
We can discover UUIDs through SDP on classic or through GATT discovery procedures in BLE. Currently, whichever finishes later ends up overwriting the UUIDs discovered by the former. So if we first discover some UUIDs using SDP and store them in the config file and then later kick off a BLE discovery, when BLE reports discovered UUIDs we do not check if there are any existing UUIDs discovered via SDP and happily overwrite the config file with only the UUIDs discovered through BLE. Bug: 235407715 Ignore-AOSP-First: Will revisit AOSP due to existing EIR related divergence Tag: #refactor Test: Manual tests using JBL5 since we discover some UUIDs on it using BLE and SDP. I made sure that the union of those is reported to Java. Change-Id: I0c12296441e9c61ea766a969e6294ea192d9a1c4
2022-06-14Merge "Increase the size of the snooz log buffer from 512 to 1024" into tm-devEtienne Ruffieux