Commit graph

5877 commits

Author SHA1 Message Date
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
Treehugger Robot
97675c486a Merge "[dynamic_sensor] correctly interpret HID data" am: dcbe8650b6 am: 69f047a046 am: 28bb4526f9 am: 9a2c8265c6
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2213197

Change-Id: I17592fb7e35a0fafc80ef668cbeac837c02b8b08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 22:01:42 +00:00
Treehugger Robot
9a2c8265c6 Merge "[dynamic_sensor] correctly interpret HID data" am: dcbe8650b6 am: 69f047a046 am: 28bb4526f9
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2213197

Change-Id: I5b68a48d18e23efd557e4661d02f53a29f59a35c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 21:33:58 +00:00
Treehugger Robot
28bb4526f9 Merge "[dynamic_sensor] correctly interpret HID data" am: dcbe8650b6 am: 69f047a046
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2213197

Change-Id: Id17fc1b60204e3d6b552763afaab6dd0680d6fa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 21:03:34 +00:00
Treehugger Robot
69f047a046 Merge "[dynamic_sensor] correctly interpret HID data" am: dcbe8650b6
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2213197

Change-Id: Iee9bef8c7260cf13e075381631a55c08f0e0f4dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 20:32:40 +00:00
Treehugger Robot
dcbe8650b6 Merge "[dynamic_sensor] correctly interpret HID data" 2022-09-09 20:08:06 +00:00
Manish Kushwaha
d4085b7193 [dynamic_sensor] correctly interpret HID data
specifically, interpret HID data value as unsigned if minValue is
positive

Fix: 238391386
Test: See "Testing Done" in comments in ag/19889364
Change-Id: I715c2189ad90ee71e022ae131354354157694556
2022-09-09 16:50:00 +00:00
Treehugger Robot
ea3b4af844 Merge "Clarify and clean up dynamic_sensor documentation" am: 4d919104dd am: a43e51cb45 am: d43f111175 am: 530caa4d82
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2194872

Change-Id: Ib583fbe593dc9d3a670d3eaf12142192658802c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 19:42:42 +00:00
Treehugger Robot
530caa4d82 Merge "Clarify and clean up dynamic_sensor documentation" am: 4d919104dd am: a43e51cb45 am: d43f111175
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2194872

Change-Id: Id252685bebe7755eeb5d37d26feaab2cf5010415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 19:24:46 +00:00
Treehugger Robot
d43f111175 Merge "Clarify and clean up dynamic_sensor documentation" am: 4d919104dd am: a43e51cb45
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2194872

Change-Id: I1e76e9569e38d1ede2ccbfb4dd1488d9137fa6c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 19:04:21 +00:00
Treehugger Robot
a43e51cb45 Merge "Clarify and clean up dynamic_sensor documentation" am: 4d919104dd
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2194872

Change-Id: Idc7bc16392d0dea3c93e8b6c83b537ce3e64816b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 18:35:56 +00:00
Treehugger Robot
4d919104dd Merge "Clarify and clean up dynamic_sensor documentation" 2022-08-25 18:14:47 +00:00
Brian Duddie
f4def6edb5 Clarify and clean up dynamic_sensor documentation
Test: n/a
Change-Id: I0b0226b1fce940bd37b8d8a1f72123948ff1fe0a
2022-08-24 23:21:45 +00:00
Treehugger Robot
a284e03a05 Merge "[Bluetooth apex] Use new apex name" am: 5c5651cf2c am: 687bb61d2e am: 52a73cdb91 am: 8d666ed762
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2192198

Change-Id: Ibffaead2d67d468c6bf32b9058f5cc14831e2e90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 03:41:38 +00:00
Treehugger Robot
8d666ed762 Merge "[Bluetooth apex] Use new apex name" am: 5c5651cf2c am: 687bb61d2e am: 52a73cdb91
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2192198

Change-Id: Ica8610821fc2119c0b2e1edf971412ac6b43413f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 02:01:16 +00:00
Treehugger Robot
52a73cdb91 Merge "[Bluetooth apex] Use new apex name" am: 5c5651cf2c am: 687bb61d2e
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2192198

Change-Id: I189149ffa16443415a671c869a3e48334ec35b5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 01:34:18 +00:00
Treehugger Robot
687bb61d2e Merge "[Bluetooth apex] Use new apex name" am: 5c5651cf2c
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2192198

Change-Id: Ic7c9233e5c0c15c929f4c0b60ab4b9cce80907b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 01:04:31 +00:00
Treehugger Robot
5c5651cf2c Merge "[Bluetooth apex] Use new apex name" 2022-08-24 00:13:29 +00:00
William Escande
4db625386f [Bluetooth apex] Use new apex name
The Bluetooth apex name is now called com.android.btservices

Bug: 243054261
Test: Build
Change-Id: Ie016fa354f5c9516b2f9a671f2235787f92da37d
2022-08-22 11:27:59 -07:00
Xin Li
09f7350d30 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: e6ba398cb2 -s ours am: f5a3b35846 -s ours am: dccdafa65f -s ours
am skip reason: Merged-In I4bc1a7cb4af2c49d6f1343843cf86c436294bed7 with SHA-1 3e805478fb is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2186752

Change-Id: Ic0a815a3892bab38c53844f570f9af21af7c4055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:35:29 +00:00