Commit graph

5917 commits

Author SHA1 Message Date
Treehugger Robot
56edfbb13c Merge "Remove libbluetooth-types-header from libhardware" 2023-07-06 11:23:07 +00:00
David Duarte
57a7f462ef Remove libbluetooth-types-header from libhardware
Change-Id: Ia8e664f4c3abfaa2e421e28afdb543c530930f77
2023-07-06 02:04:34 +00:00
Steven Moreland
db3bbfcbf1 Merge changes from topic "b37280010"
* changes:
  fused_location.h: vendor-only
  Add include/hardware/*.h symlinks.
  Split up headers.
2023-06-22 23:48:23 +00:00
Steven Moreland
68990e5354 fused_location.h: vendor-only
This commit hides fused_location.h from the system.

- include - it is no longer in the global include
- include_all - it is no longer accessible to system things which
    use libhardware

Bug: 37280010
Test: boot/build
Change-Id: I12297f28d8d2330821f45c3a2caced026ea703ed
2023-06-02 23:01:56 +00:00
Steven Moreland
3556da3b4a Add include/hardware/*.h symlinks.
These are required to build. Separate CL to preserve blame history.

From running 'update-includes.sh' script here.

Bug: 37280010
Test: boot/build (sanity)
Change-Id: Id9c2dc37f674b27b947a9f823bd38a550d64d31b
2023-06-02 23:01:56 +00:00
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
17c0d514dc Merge "Use requested sample rate when it matches device sample rate." am: c0a81b9dc6
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2592208

Change-Id: I8e9afe8823aefcdef026d8cc6562713e0f6d8b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 18:58:21 +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
2ef70764b0 Merge "Revert "Delete bluetooth.h"" am: 0763f1b968
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2594895

Change-Id: I5f59a468538a090e0dcca5a3ab3b13e8a4f488bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 01:24:17 +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
fd5c609420 Merge "Delete bluetooth.h" am: 33d6b957e5
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2517798

Change-Id: I83c10e84578d5d190d2b3e9fc9e09914f98a9f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:04:43 +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
26748f3084 Merge "Add 'com.android.media' to apex_available of libhardware_headers" am: 3fe6921aff
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2585125

Change-Id: I7d5962e4a6ed76887174edefa87da6568cde8cba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 18:16:41 +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
d71f056272 Merge changes I89798eee,Ic3dbab31 am: 14f321f5a7
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2550090

Change-Id: Iefb85b244cd7800dbf755e4715b81db49d15f4d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 18:46:48 +00:00
jiabin
3f274495a7 Set standby as false when the stream is started successfully. am: 041a7d90dd
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2572211

Change-Id: I7598ebc20335e4e92760a86bc5dc94877cca7a9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 18:46:47 +00: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
512d8574c3 Merge "AudioParameter: Use for RemoteSubmix exiting" am: e8ab477900
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2562191

Change-Id: I2289b2030ee68207c12c3b60be051d9951f402e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 21:45:47 +00: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
340d4ef692 [automerger skipped] Merge "Merge Android 13 QPR2" am: 728df4f5fc -s ours am: 44f5617ab8 -s ours
am skip reason: Merged-In I5fb5b9ff37a6f8a245678c87ee82e2032dc845f2 with SHA-1 9a056455f2 is already in history

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

Change-Id: I111c436ceaf553597f4002d0b494d21009c06b8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:07:50 +00:00
Xin Li
5d5660f121 [automerger skipped] Merge Android 13 QPR2 am: 90d5444233 -s ours am: d104ec269f -s ours
am skip reason: Merged-In I5fb5b9ff37a6f8a245678c87ee82e2032dc845f2 with SHA-1 9a056455f2 is already in history

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

Change-Id: I74a3d31b3d1a5ed80be6cdfc838757c504d849a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:06:00 +00:00
Xin Li
44f5617ab8 [automerger skipped] Merge "Merge Android 13 QPR2" am: 728df4f5fc -s ours
am skip reason: Merged-In I5fb5b9ff37a6f8a245678c87ee82e2032dc845f2 with SHA-1 9a056455f2 is already in history

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

Change-Id: Ia2418ac8c3766bfa9ca7326f2fdff8b92660d688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:33:53 +00:00
Xin Li
d104ec269f [automerger skipped] Merge Android 13 QPR2 am: 90d5444233 -s ours
am skip reason: Merged-In I5fb5b9ff37a6f8a245678c87ee82e2032dc845f2 with SHA-1 9a056455f2 is already in history

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

Change-Id: Ieae65577f96e42434c05d204d060e683d5aa94d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:32:04 +00: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
3a4985379c Merge "Enable Windows host compilation of libhardware-headers" am: 442dc965cc am: 583fab5811
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2417909

Change-Id: I51ca563dcf4c5f4703fbaddc77339b630a18e908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-07 02:35:13 +00: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
6766ca4760 Merge "HidRawDeviceTest: Enable for device build" am: 698fe8448b am: f4871891b2
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2404797

Change-Id: Iefe0f46e81d0964999b33d9f37abffe3e95caada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06 21:35:04 +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
2daabfee14 Merge changes from topic "aospUsbHal-bitPerfect" am: 593156f5e9 am: 345ebca6ba
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2419940

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

Change-Id: I7123ae5563007386d9f31c73c61c9fd9ef8920c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03 23:32:49 +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
e6ec02879f [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: bae8fdfc80 -s ours
am skip reason: Merged-In I5fb5b9ff37a6f8a245678c87ee82e2032dc845f2 with SHA-1 9a056455f2 is already in history

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

Change-Id: I041776ff1b29b71d34533dfa7d31027d243bb359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 08:07:59 +00: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