Commit Graph

604 Commits

Author SHA1 Message Date
Treehugger Robot
1891065c68 Merge "Fix vts sco test fail for usb interface" into main am: 98e165d1f6 am: 040bf58a56
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2623690

Change-Id: I2a3a738dd5cdc901a35a5ed43510c343872d5dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 18:36:51 +00:00
xiaoshun.xu
4e85c09959 Fix vts sco test fail for usb interface
[Description]
If bt controller device is usb interface,
sco loopback single pkt and bandwidth test can not pass
because pkt size is limited accroding to core spec

[Root Cause]
USB sco packet size is limited in spec

[Solution]
If is bt usb chip, continuous receive sco packets
  from controller until size is enough

[Test Report]
Test Pass

Bug: 286355871
Change-Id: Idb150d8a72149f7e1dfaccfd7bc82a91710da59c
2023-07-18 09:34:08 +08:00
Myles Watson
e080dca0bc Merge "BluetoothAudio: Statically link HAL dependencies" into main am: e023a39508 am: 1e0b2ebe91 am: 86a42ced71
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2654741

Change-Id: If958936c1b87aeb15332f3972c45b6d3b8bf22d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 02:37:58 +00:00
Myles Watson
44628f38d2 BluetoothAudio: Statically link HAL dependencies
Bug: 290666670
Bug: 289857524
Bug: 284091286
Bug: 289489060
Test: mma -j32
Change-Id: I2b3c32b133e208ec2cfb1b244ccb24ad249f22df
2023-07-11 16:08:27 -07:00
Bao Do
97c60a8941 Add a config with test skipping for SDK < 33 am: 00dede017f am: 96cfab642d am: aa9d996afd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651740

Change-Id: Ie5f490336c080ef24252870651b506160585b965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 11:28:52 +00:00
Bao Do
00dede017f Add a config with test skipping for SDK < 33
Test: atest VtsHalBluetoothAudioTargetTest
Bug: 288598199
Change-Id: I563c8d50b186f2da2cf077dc3631808f8c2a9eee
2023-07-10 07:43:09 +00:00
Treehugger Robot
b2a55b46de Merge "Revert "Fix VTS Fuzz issue"" am: e959d0923d am: cfb439b4eb am: b6f1abab75
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646737

Change-Id: I78379a5e03447b878d035432cfefc4a81ef818cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-03 14:51:39 +00:00
Treehugger Robot
e959d0923d Merge "Revert "Fix VTS Fuzz issue"" 2023-07-03 12:43:04 +00:00
Guillaume Bailey
a2b4a18ab7 Revert "Fix VTS Fuzz issue"
This reverts commit 1adfae9364.

Reason for revert: Causes Sabrina/Boreal bt stacks to timeout on startup
Bug: 247053367

Change-Id: Ibef97f054510c826920bb30725fed168c755cc14
2023-07-03 12:10:36 +00:00
Myles Watson
9cde8d7582 Merge "Fix bluetooth AIDL restart fail when open HCI Fail" am: 0e55fec5c3 am: 288283d9c5 am: f9a467a874
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2643490

Change-Id: Ia0f205252e1d029567a7d6e831a43d924167f909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 16:04:25 +00:00
yanggang.yang
6ebe251322 Fix bluetooth AIDL restart fail when open HCI Fail
[Description]
If aidl open HCI fail at the first time, the aidl state
can not change to enable for the next time to initialize.

[Root Cause]
Bluetooth AIDL State is always equal to INITIALIZING after
open hci fail at the first time.

[Solution]
When open HCI fail at the first time, initialize the mstate to ready

Bug: 285517442
Test: pass

Change-Id: I19756d6602ba931242d0f95942db55c505a210bb
2023-06-28 09:13:57 +00:00
Edward Liaw
c01432b259 Merge "TEST_MAPPING: enable vts hal tests in kernel-presubmit" am: 24a8a39219 am: 69771123ba am: ac75f2d41c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2610093

Change-Id: Id502dbe01f18f68a140290f5f0bf8b709d35bf0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 22:00:27 +00:00
Edward Liaw
24a8a39219 Merge "TEST_MAPPING: enable vts hal tests in kernel-presubmit" 2023-06-01 20:34:33 +00:00
Edward Liaw
24696b3e32 TEST_MAPPING: enable vts hal tests in kernel-presubmit
Enable the following tests:
VtsHalBluetoothAudioTargetTest
VtsHalGraphicsComposerV2_4TargetTest

Bug: 284307085
Bug: 258819618
Test: atest :kernel-presubmit
Change-Id: I8667eaee120777a776339481f72558566e6c94b3
Signed-off-by: Edward Liaw <edliaw@google.com>
2023-06-01 16:08:42 +00:00
Jooyung Han
13f58a77f3 Merge "Set root elements for xsd_config modules" am: ee8374606a am: 5a73645eb0 am: f371c2e7bc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2596609

Change-Id: Idb0d2297407a5708a8e21362ef39c7a32c371dfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 06:16:20 +00:00
Jooyung Han
16d5af6755 Set root elements for xsd_config modules
This reduces the code size by not generating unnecessary code for
non-root elements.

Bug: 283700992
Test: m
Change-Id: I23bd5c2a0ccc40fded3ca08155ead5f4680c2ed9
2023-05-22 16:43:12 +09:00
Yichun Li
e908a03e1d Merge "Revert "Remove unused hardware/bluetooth.h include"" am: 3ac998fa8c am: 79119d91d0 am: f1c107e68d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2594896

Change-Id: I3ca64c9c9e1162c3f1d4f8f8af225c0e821aafb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 02:53:08 +00:00
Yichun Li
3ac998fa8c Merge "Revert "Remove unused hardware/bluetooth.h include"" 2023-05-19 00:45:21 +00:00
Yichun Li
6d9773daf4 Revert "Remove unused hardware/bluetooth.h include"
Revert submission 2517798-remove_bluetooth_h

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_tm-qpr-dev-plus-aosp&target=aosp_bramble-userdebug&lkgb=10164200&lkbb=10164726&fkbb=10164208

Reverted changes: /q/submissionid:2517798-remove_bluetooth_h

Bug: 10164208
Change-Id: I52877f236db874e95228707d533698e3c12ecde1
2023-05-19 00:33:14 +00:00
David Duarte
f093402a1e Merge "Remove unused hardware/bluetooth.h include" am: 9d2cdddb88 am: 99c2543da3 am: f229895e69
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2589266

Change-Id: Ida1ebb083b03f39b98ff69f5e4689595edbdd9f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:38:05 +00:00
David Duarte
9d2cdddb88 Merge "Remove unused hardware/bluetooth.h include" 2023-05-18 21:50:50 +00:00
Myles Watson
9868117f45 Merge "Bluetooth HIDL 1.0: Log BDADDR source" am: f5212f4528 am: 356da88842 am: 531236e188
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2595997

Change-Id: Id1ef1f0fd85b1fb7d1b1069eef66894441fe0908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 21:36:16 +00:00
Myles Watson
970886d163 Bluetooth HIDL 1.0: Log BDADDR source
Bug: 283116345
Test: atest VtsHalBluetoothV1_0TargetTest
Change-Id: I2099dac406035a5f4698806a2d3b016e5dc1a913
2023-05-18 10:32:39 -07:00
David Duarte
26e456b792 Remove unused hardware/bluetooth.h include
Change-Id: I1877f6266cd105bb830a37ff4ac964f240dfa163
2023-05-15 20:30:54 +00:00
Treehugger Robot
ba20c7b6b7 Merge "VTS: Reduce TV's advertising set requirement to 10" into udc-dev am: 1b3c54106e
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23202864

Change-Id: I42e1e03034ebbcfd034be9f9d049dfa11c0d1130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 19:00:22 +00:00
Treehugger Robot
4b518cc3e7 VTS: Reduce TV's advertising set requirement to 10
Bug: 281798597
Test: atest VtsHalBluetoothVTargetTest
Change-Id: Ia3be5a1c7a7acc5270baef74b295291c32851987
2023-05-11 23:54:11 -07:00
Treehugger Robot
5e0277ff94 VTS: Reduce TV's advertising set requirement to 10
Bug: 281798597
Test: atest VtsHalBluetoothVTargetTest
Change-Id: Ia3be5a1c7a7acc5270baef74b295291c32851987
2023-05-11 23:51:26 -07:00
Treehugger Robot
9269b194a6 Merge changes If33bee4e,I0c14c062 am: 6ca63b0e20 am: d64df0bd01 am: fdaef2eb09
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2585012

Change-Id: Ibc56b0b1dc9041f84f3ff13084fcdf5b73fcf112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 04:17:42 +00:00
Treehugger Robot
6ca63b0e20 Merge changes If33bee4e,I0c14c062
* changes:
  Improve AudioProvider logging
  Fix deathRecipient of BluetoothAudioProvider
2023-05-12 02:17:13 +00:00
William Escande
fb6dd74b2c Improve AudioProvider logging
Bug: 245009140
Test: looked at some beautiful log when bluetooth is killed (RIP)
Change-Id: If33bee4e875812ce3710d41014cae8bd54d840f2
2023-05-12 00:46:05 +00:00
William Escande
f3faab081a Fix deathRecipient of BluetoothAudioProvider
The "provider" is managed with a shared_ptr but we do not hold it and
instead are giving the raw inner pointer as binderDiedCallbackAidl.
This can randomly generate crash as the provider may be freed outside of
this code.

Replacing the provider with a context that we can manually allocate and
deallocate.
Setup AIBinder_DeathRecipient_setOnUnlinked to clean the data allocated

Bug: 245009140
Test: m android.hardware.bluetooth.audio-impl and start / stop session +
      manually kill bluetooth process during audio play
Change-Id: I0c14c062a8bde7e532ff02f01991d66da33ec569
2023-05-11 17:45:43 -07:00
Treehugger Robot
62eb791ab2 Merge "VTS: Rename Vsr_Bluetooth5Requirments" am: 3551f2963e am: 5b83b95388 am: 80537228a0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2585149

Change-Id: I60c4bda67ade7725daf6624a6a594fa3ddc65206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 01:11:29 +00:00
Myles Watson
5bfb3a7995 VTS: Rename Vsr_Bluetooth5Requirments
Bug: 281798597
Test: atest VtsHalBluetoothTargetTest
Change-Id: I7db99066be11a6dae206cfe4997101db751ae059
2023-05-10 14:06:32 -07:00
Thomas Girardier
abf0d08ba1 Merge "Always use audio_configuration_changed_cb_ to notify the config update" into udc-dev am: 98d6368ebb
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/22241290

Change-Id: I2031bfc738b3d1fb97641f5fb252da9b15655688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 05:27:35 +00:00
Thomas Girardier
98d6368ebb Merge "Always use audio_configuration_changed_cb_ to notify the config update" into udc-dev 2023-05-04 04:55:16 +00:00
Treehugger Robot
f3dcc82a6b Merge "Bluetooth AIDL: SetTerminalRaw on fd" am: 4de72a2297 am: bb8c28de90 am: 8b2a877457
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2556557

Change-Id: I31c22dd5c92a8fef9769280885fce4f1f4f49b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 21:18:19 +00:00
yanggang.yang
d1abb34b44 Bluetooth AIDL: SetTerminalRaw on fd
Call SetTerminalRaw on the fd that was opened, since mFD has not been set. If SetTerminalRaw fails, log it but continue, since some platforms do not need this call.

Bug: 279870989
Test: start Bluetooth on a device that doesn't need SetTerminalRaw
(cherry picked from https://android-review.googlesource.com/q/commit:eb744bc14c0d1e64c4291b3f869d6055db36b0f3)
Merged-In: I97c92c407b7c80442a0ba0812a630525219670a0
Change-Id: I97c92c407b7c80442a0ba0812a630525219670a0
2023-04-28 19:36:38 +00:00
Treehugger Robot
4de72a2297 Merge "Bluetooth AIDL: SetTerminalRaw on fd" 2023-04-28 19:29:33 +00:00
Henri Chataing
a4b4be6c2b Merge "Bluetooth: Enable test Cdd_C_12_1_Bluetooth5Requirements" am: f41cdd3d0d am: 2c2472ee9e am: 30bc77e297
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2551038

Change-Id: Ia47d1611ce185c4ed0faf4a3e85aca404f0c9800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 19:09:56 +00:00
Henri Chataing
f41cdd3d0d Merge "Bluetooth: Enable test Cdd_C_12_1_Bluetooth5Requirements" 2023-04-28 17:35:03 +00:00
yanggang.yang
eb744bc14c Bluetooth AIDL: SetTerminalRaw on fd
Call SetTerminalRaw on the fd that was opened, since mFD has not been set. If SetTerminalRaw fails, log it but continue, since some platforms do not need this call.

Bug: 279870989
Test: start Bluetooth on a device that doesn't need SetTerminalRaw
Change-Id: I97c92c407b7c80442a0ba0812a630525219670a0
2023-04-28 17:02:08 +00:00
Henri Chataing
423e872985 Merge "Bluetooth: Add a test for alignment" am: 8e9bf734b4 am: 47dcda19a4 am: 3c55842fea
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2553812

Change-Id: I799e7f9dbd8ec6bff12fd46b1d118e0ffa69e638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 23:02:14 +00:00
Treehugger Robot
57ade39fc5 Merge "Fix HCI parser and packetizer" am: de5c086b79 am: a80d7f5e25 am: 03c5b4076d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2548490

Change-Id: I647888fd80fb1caf56e5d2a546b0f9ca7d0c7653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:59:52 +00:00
Elie Kheirallah
f454e03c9e Merge "Fix null dereference read in android::hardware::bluetooth::hci::H4Protocol::Send" am: 3f2f348c48 am: dcc46ec5bd am: dc747c1046
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2548491

Change-Id: Iad5e17bfb76ff28c6ae3bfa5b465893a577d5457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:23:44 +00:00
Henri Chataing
8e9bf734b4 Merge "Bluetooth: Add a test for alignment" 2023-04-21 17:33:23 +00:00
Treehugger Robot
de5c086b79 Merge "Fix HCI parser and packetizer" 2023-04-21 17:22:19 +00:00
Myles Watson
bcc997bdf3 Bluetooth: Add a test for alignment
Bug: 276652301
Test: atest --host bluetooth-vendor-interface-hci-test
Change-Id: I3e862dd88aeed65e7a4ef1f9a223cc520a1ccc54
2023-04-21 16:48:16 +00:00
Henri Chataing
2845303342 Fix HCI parser and packetizer
Issue found from the test H4ProtocolAsyncTest#TestMultiplePackets.
The packetizer does not correctly handle a packet termination
at the beginning of a chunk.

Test: atest --host bluetooth-vendor-interface-hci-test
Bug: 276652301
Change-Id: I1b61efcfa5f817fdb8b5870e81d660be5279fdea
2023-04-21 16:10:22 +00:00
Elie Kheirallah
3f2f348c48 Merge "Fix null dereference read in android::hardware::bluetooth::hci::H4Protocol::Send" 2023-04-21 15:04:56 +00:00
Henri Chataing
0c581a084a Bluetooth: Enable test Cdd_C_12_1_Bluetooth5Requirements
The requirements have been added to RootCanal:
 - LE Periodic Advertising
 - LL Privacy
 - LE 2M Phy

Test: atest
Bug: 275847929
Change-Id: Ifa49494091727bf162554a658629bc4ec3c3cd63
2023-04-20 23:12:06 +00:00