Commit graph

5896 commits

Author SHA1 Message Date
Steven Moreland
d783cabd4d Split up headers.
This splits headers into three locations:
include - for backwards compatibility, the global include
include_all - for things system/vendor both use
include_vendor - for things that only vendors use

The goal is to gradually have system things stop referencing
(at least most) of these headers.

Bug: 37280010
Test: build (CL on top adds back in symlinks)

Change-Id: Ibf194276b7faa857e1e7605d7719f4e7d873ecba
2023-06-02 23:01:54 +00:00
Treehugger Robot
c0a81b9dc6 Merge "Use requested sample rate when it matches device sample rate." 2023-05-22 18:28:54 +00:00
Yichun Li
0763f1b968 Merge "Revert "Delete bluetooth.h"" 2023-05-19 00:45:21 +00:00
Yichun Li
f8028b370d Revert "Delete bluetooth.h"
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: I32d42ce282c82c4435ce071c8aa8969cceae2e68
2023-05-19 00:33:13 +00:00
David Duarte
33d6b957e5 Merge "Delete bluetooth.h" 2023-05-18 21:50:50 +00:00
David Duarte
3552b1c400 Delete bluetooth.h
hardware/bluetooth.h was copied into Bluetooth in https://r.android.com/513838

Change-Id: Ia7388b446bd37b3cbdf8276c8c4d11e8af17640c
2023-05-18 09:12:40 +00:00
jiabin
abf24d3cc7 Use requested sample rate when it matches device sample rate.
For input stream, the sample rate should be set as requested one if it
matches the device sample rate and is valid.

Bug: 282816698
Test: TH
Change-Id: Iebee2b269062609ff7bcd460f48714ca64980e68
2023-05-16 23:20:17 +00:00
Mikhail Naganov
3fe6921aff Merge "Add 'com.android.media' to apex_available of libhardware_headers" 2023-05-10 17:52:45 +00:00
Mikhail Naganov
c7bb2114e1 Add 'com.android.media' to apex_available of libhardware_headers
Due to adding a dependency of libmedia_helper on
libhardware_headers

Bug: 278976019
Test: m
Change-Id: I97df31b209630dc7fb6b46a0b0221c0d496e6375
Merged-In: I97df31b209630dc7fb6b46a0b0221c0d496e6375
2023-05-09 14:32:23 -07:00
Treehugger Robot
14f321f5a7 Merge changes I89798eee,Ic3dbab31
* changes:
  Intermittently Audio is not heard in USB Head set, while disconnecting /connecting the usb audio headset.
  Set standby as false when the stream is started successfully.
2023-05-03 17:55:13 +00:00
weizd
5ad6d32f33 Intermittently Audio is not heard in USB Head set, while
disconnecting /connecting the usb audio headset.

In usb audio_hal.c, out-stream standby status was not aligned in
adev_create_audio_patch(), so that stream was considered being in
standby after open.

fix:    Align the standby status.
change: correct update for review comments.

Test: usb headset open works fine with huge times insert/remove.
Change-Id: I89798eeee33d8c5019e7510c23371cb18a00ed32
2023-04-28 11:01:15 -07:00
jiabin
041a7d90dd Set standby as false when the stream is started successfully.
When the audio patch is created and the stream is started, set the
standby as false. In that case, if there is a simultaneous request for
read or write data, it is no need to start the stream again.

Bug: 212509560
Test: repo steps in the bug
Change-Id: Ic3dbab3134bc761271b6b2ac8619135ef08075bc
Merged-In: Ic3dbab3134bc761271b6b2ac8619135ef08075bc
2023-04-28 10:58:50 -07:00
Andy Hung
e8ab477900 Merge "AudioParameter: Use for RemoteSubmix exiting" 2023-04-25 20:53:00 +00:00
Andy Hung
c2992c7112 AudioParameter: Use for RemoteSubmix exiting
Test: compiles
Bug: 279106598
Merged-In: I50263a48584bac120c65123cd5bed09f60582089
Change-Id: I50263a48584bac120c65123cd5bed09f60582089
2023-04-25 10:45:59 -07:00
Xin Li
728df4f5fc Merge "Merge Android 13 QPR2" 2023-03-14 21:40:43 +00:00
Xin Li
90d5444233 Merge Android 13 QPR2
Bug: 273316506
Merged-In: I5fb5b9ff37a6f8a245678c87ee82e2032dc845f2
Change-Id: Id186d8c8323c8783c479ce1c16941a674824cff4
2023-03-13 23:11:17 -07:00
Oystein Eftevaag
583fab5811 Merge "Enable Windows host compilation of libhardware-headers" am: 442dc965cc
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2417909

Change-Id: I041fba2acae777fc0947e4afffb5cce3f4c1d66b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-07 01:57:21 +00:00
Oystein Eftevaag
442dc965cc Merge "Enable Windows host compilation of libhardware-headers" 2023-02-07 01:15:23 +00:00
Oystein Eftevaag
2007fd1ee6 Enable Windows host compilation of libhardware-headers
Bug: 261908998
Test: scrypt builds using MinGW
Change-Id: Ica552fe1fb89c94f6ea2210a4c50d1b504929d11
2023-02-06 22:23:28 +00:00
Andy Hung
f4871891b2 Merge "HidRawDeviceTest: Enable for device build" am: 698fe8448b
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2404797

Change-Id: Ie2968a66d2f4961ffd8462874710f7eb37dd99ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06 21:01:17 +00:00
Andy Hung
698fe8448b Merge "HidRawDeviceTest: Enable for device build" 2023-02-06 20:24:33 +00:00
Treehugger Robot
345ebca6ba Merge changes from topic "aospUsbHal-bitPerfect" am: 593156f5e9
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2419940

Change-Id: I993649ac1310e5401287531c721e869fe9a0f240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03 22:40:11 +00:00
jiabin
d38a7b9807 Add volume control for AOSP USB audio HAL. am: 016fa2107c
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2419939

Change-Id: I3afef6641d042b8e2b06602462101c4adea715a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03 22:40:09 +00:00
Treehugger Robot
593156f5e9 Merge changes from topic "aospUsbHal-bitPerfect"
* changes:
  Support opening bit-perfect output stream.
  Add volume control for AOSP USB audio HAL.
2023-02-03 21:45:46 +00:00
jiabin
fea9e1be0a Support opening bit-perfect output stream.
When opening bit-perfect output stream, the HAL should require the HAL
configuration match the request exactly.

Bug: 262581771
Test: manually
Change-Id: I2f79d41ad42b0c662d28667bde6ae115575d41e1
Merged-In: I2f79d41ad42b0c662d28667bde6ae115575d41e1
2023-02-02 21:51:11 +00:00
jiabin
016fa2107c Add volume control for AOSP USB audio HAL.
When the stream is open with bit-perfect output flag, the volume command
may be sent to the HAL. Use volume control from the mixer when it is
present.

Bug: 262581771
Test: adjust volume
Change-Id: I11e76450a2c3dbcad0ddbd56bd3db1ea83f10f2b
Merged-In: I11e76450a2c3dbcad0ddbd56bd3db1ea83f10f2b
2023-02-02 21:50:43 +00:00
Andy Hung
b264eb4bd3 HidRawDeviceTest: Enable for device build
Test: $ adb shell hidrawdevice_test /dev/hidraw0
Bug: 265754293
Change-Id: I103ebc030f012d11e977fc155fc68f884f71f518
2023-01-27 11:42:20 -08:00
Xin Li
bae8fdfc80 Merge tm-qpr-dev-plus-aosp-without-vendor@9467136
Bug: 264720040
Merged-In: I5fb5b9ff37a6f8a245678c87ee82e2032dc845f2
Change-Id: I7a5fa42c0aea354cd0320887df4f907d2c71cdaa
2023-01-11 22:47:14 -08:00
Treehugger Robot
caeb590d0a Merge "Fix sizeof warnings on unusual calloc" am: 4ca44e7615 am: 3f31ee2d2a
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2337324

Change-Id: I57129773e0e1007c0b774daaf5d898da6736ee44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 02:22:00 +00:00
Treehugger Robot
3f31ee2d2a Merge "Fix sizeof warnings on unusual calloc" am: 4ca44e7615
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2337324

Change-Id: I7303e88a3abe9645f537e271a0e156c4b083ea33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 23:28:20 +00:00
Treehugger Robot
4ca44e7615 Merge "Fix sizeof warnings on unusual calloc" 2022-12-09 21:55:05 +00:00
Chih-Hung Hsieh
69e9179327 Fix sizeof warnings on unusual calloc
Test: make tidy-hardware-libhardware-modules-soundtrigger_subset
Change-Id: If1afcd4834461a2d1f855832dc89b8ae54bd8e2f
2022-12-09 12:41:40 -08:00
Eran Messeri
49f990fb86 Merge "Add the second IMEI tag" am: 9e34eae550 am: 308d43a303
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2295117

Change-Id: Id43404c93f7d2fd97c5f14a77f9da7eb899e77b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 18:12:07 +00:00
Eran Messeri
308d43a303 Merge "Add the second IMEI tag" am: 9e34eae550
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2295117

Change-Id: I5a0a6319de0c35e9b7e4688a5e70e263bb21272f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 17:39:32 +00:00
Eran Messeri
9e34eae550 Merge "Add the second IMEI tag" 2022-12-05 17:16:16 +00:00
Devin Moore
8dc381c5cf Merge "Add a LINT.IfChange to sensors_event_t" am: 878d3d1c7e am: bc544c7d9a
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2320221

Change-Id: I82e16c91597ab2cc4b89dd3f179c196886625ba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02 00:10:57 +00:00
Devin Moore
bc544c7d9a Merge "Add a LINT.IfChange to sensors_event_t" am: 878d3d1c7e
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2320221

Change-Id: I79a9d57eaa8ab860468cfcf4ec03c79d606b8333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 23:43:08 +00:00
Devin Moore
878d3d1c7e Merge "Add a LINT.IfChange to sensors_event_t" 2022-12-01 22:57:09 +00:00
Devin Moore
894dd49d68 Add a LINT.IfChange to sensors_event_t
If that is changed, ASensorEvent also needs to be changed.

Test: na
Bug: 259711109
Change-Id: If1fdedba6a73d46b64f47490a7946954c47a3b79
2022-11-29 19:13:56 +00:00
Eran Messeri
bd9dcfcf4f Add the second IMEI tag
This CL keeps keymaster_defs.h in sync with the changes to
KeymasterDefs.java.

Bug: 244732345
Test: n/a
Change-Id: I3dbed2c077d74ffd276ea007c165309a61f90992
2022-11-28 12:07:41 +00:00
Devin Moore
cac763718a Merge "Make libhardware host_supported" am: 65d6174bbc am: 32acb4a0c2
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2305002

Change-Id: Ic8c42311976ab3f5f118f4ecd1a46aae81e6c350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 18:42:38 +00:00
Devin Moore
32acb4a0c2 Merge "Make libhardware host_supported" am: 65d6174bbc
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2305002

Change-Id: If245768b5cfe2dc69b2abc744443d464e2728bce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 18:16:02 +00:00
Devin Moore
65d6174bbc Merge "Make libhardware host_supported" 2022-11-22 17:37:49 +00:00
Devin Moore
690e02aa2c Make libhardware host_supported
This requires dropping a header file and avoiding a missing strlcpy API.
Required for host_supported fuzzers that include this lib.

Test: libsensorserviceaidl_fuzzer
Bug: 205764765

Change-Id: Ib1d2851e915ed87ef2936a044e7a72bab3077f40
2022-11-17 17:47:52 +00:00
Christopher Ferris
de12b9273e Merge "Modify a data structure into a union." am: 8e965d90de am: 9d6b418d6f
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2243423

Change-Id: Id3bbeac041d086619e7313286e144ea2b7c1a931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-03 02:30:27 +00:00
Christopher Ferris
9d6b418d6f Merge "Modify a data structure into a union." am: 8e965d90de
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2243423

Change-Id: I2672f7b1321efcd40651704db4398ffe22e370b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-03 01:58:47 +00:00
Christopher Ferris
8e965d90de Merge "Modify a data structure into a union." 2022-11-03 01:20:03 +00:00
Brian Duddie
2e6815d22a Increase dynamic sensor op timeout to 1.6 sec am: 9a056455f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/20333186

Change-Id: Ie65bd144da9d4fc20fc3ea799dc148419fda0484
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 10:02:52 +00:00
Brian Duddie
9a056455f2 Increase dynamic sensor op timeout to 1.6 sec
Minimizes intermittent failures when a device is in sniff mode.

Fixes: 245881714
Test: enable/disable with spatial audio feature enabled
Change-Id: I5fb5b9ff37a6f8a245678c87ee82e2032dc845f2
2022-10-31 23:15:15 +00:00
Christopher Ferris
8b0619b47d Modify a data structure into a union.
The new 6.0 kernel headers changed all variable length
structures from [0] to []. This causes a clang warning to
trigger, so rewrite the affected data structure using a
union to avoid having a variable sized array in the middle
of the structure.

Test: Builds.
Change-Id: I60c6d31a93566c4aa9f7501f39f88543ee76ce91
2022-10-13 12:39:44 -07:00