Commit Graph

67200 Commits

Author SHA1 Message Date
Daniel Zheng
2b7faed499 boot_control: use overrides am: cba986107b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3304400

Change-Id: I22d00b492b1bee43dbbe0c59274130d59b2b0638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-10 18:24:31 +00:00
Daniel Zheng
cba986107b boot_control: use overrides
BootControlClientAIDL and BootControlClientHIDL are child classes of BootControlClient. We should
use proper inheritance and override the base class methods.

Test: th
Change-Id: Ia741f28bc463b55dc075a17901a024566324564a
2024-10-10 09:57:38 -07:00
Aditya Kumar
1d83f62b29 Merge "error: no matching constructor for initialization of 'std::ifstream'" into aosp-main-future 2024-10-10 16:38:26 +00:00
Treehugger Robot
9a77606dad Merge "audio: Deprecate StreamSwitcher" into main am: 3f4c251a00
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3303915

Change-Id: I10206bdf0f8300aa52886f2b28a4793843067e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-10 16:21:56 +00:00
Treehugger Robot
3f4c251a00 Merge "audio: Deprecate StreamSwitcher" into main 2024-10-10 16:08:26 +00:00
Daniel Zheng
e514a0618f Merge "boot_control death recipient" into main am: c15d064c4a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3299064

Change-Id: Ibb29b9f09e00a15ce163513d62fc7b32e9c836e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-10 01:27:22 +00:00
Mikhail Naganov
92166144a2 audio: Deprecate StreamSwitcher
Use of StreamSwitcher causes threading issues with the FMQ due to
using it in a way which is not anticipated by the FMQ design.

Stream implementations that need to change its behavior depending
on connected devices must do it without changing the I/O thread.
For example implementations please refer to PrimaryStream and
RemoteSubmixStream.

The class code has been moved to 'deprecated' directory and
namespace, and will be removed in the future. Any classes which
currently depend on StreamSwitcher should be updated mechanically
to use the new name and the include file location. Such classes
need to be planned to be overhauled as soon as possible to remove
the dependency on StreamSwitcher.

Bug: 300130515
Test: m
Change-Id: I6b0d20274013826360ca5efa69a01df9457db9c6
2024-10-09 18:19:27 -07:00
Daniel Zheng
c15d064c4a Merge "boot_control death recipient" into main 2024-10-10 01:10:11 +00:00
Daniel Zheng
28b6b2b1b6 boot_control death recipient
When boot control service dies, we should log that it is no longer
available. To do this, we should register a death recipient in the
client.

Bug: 369289491
Test: kill bootctl service while running OTA
Change-Id: If766451cafe939725e7a88b1ca23b2a4af0d1a80
2024-10-09 21:19:44 +00:00
Aditya Kumar
5d2b901798 error: no matching constructor for initialization of 'std::ifstream'
```
hardware/interfaces/automotive/ivn_android_device/impl/default/src/IvnAndroidDeviceService.cpp:51:19: error: no matching constructor for initialization of 'std::ifstream' (aka 'basic_ifstream<char>')
   51 |     std::ifstream configStream(mConfigPath);
      |                   ^            ~~~~~~~~~~~
```

Bug: b/353528991
Change-Id: Idddd5d3e38e2d14bb1becdffbc0649b2f3bb5dae
(cherry picked from commit 124b2802a1)
2024-10-09 20:52:03 +00:00
Treehugger Robot
7a45b88fd0 Merge "ExternalCameraHAL: Get old image if taking picture without preview" into main am: 70c35c3986
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3277653

Change-Id: I4f794fa661b082b8ee9e8945eb4b36a3cc109cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-09 17:53:24 +00:00
Treehugger Robot
70c35c3986 Merge "ExternalCameraHAL: Get old image if taking picture without preview" into main 2024-10-09 17:28:50 +00:00
jimmyshiu
5e96564a03 [automerger skipped] VTSHalPowerTarget: check if HintSession supported am: f5a213c5ed -s ours am: afeb6bbb8c -s ours am: 8c8c1c1215 -s ours
am skip reason: Merged-In Ia1161aeafcd541745e7e0da1bd4c1781dc535460 with SHA-1 92e08f9387 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3269678

Change-Id: Ibc7f7115eb49b79a00b984b8c1b9f50cb05e5b9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-09 08:26:38 +00:00
Tomasz Wasilczyk
dc85d9f8ad Remove unused global const variable am: 6dc643db27 am: 16e747fe60 am: 0b06be49cc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3298493

Change-Id: I7f3ab7b082522fdc7cb4f9fc1012834b2c3adf07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-09 08:26:28 +00:00
Matt Buckley
a9ae7cea74 [automerger skipped] Refactor Power VTS in terms of AIDL version am: 87f9c220b5 -s ours am: b2c1536da9 -s ours am: 4562fbb120 -s ours
am skip reason: Merged-In I3cef31fa8dc6341a47d173a13d07521bafe4a1e5 with SHA-1 42027e0ee7 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3298492

Change-Id: I72aa0af79189f2ca6a056840ba04cf1b9da8f0f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-09 08:26:23 +00:00
jimmyshiu
8c8c1c1215 [automerger skipped] VTSHalPowerTarget: check if HintSession supported am: f5a213c5ed -s ours am: afeb6bbb8c -s ours
am skip reason: Merged-In Ia1161aeafcd541745e7e0da1bd4c1781dc535460 with SHA-1 92e08f9387 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3269678

Change-Id: I1b3e273f9a01abf0f83304abb081320756ce5bef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-09 07:54:56 +00:00
Tomasz Wasilczyk
0b06be49cc Remove unused global const variable am: 6dc643db27 am: 16e747fe60
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3298493

Change-Id: Ie8fc6494c582e305e91e84383e7e7f46b0b81e78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-09 07:54:54 +00:00
Matt Buckley
4562fbb120 [automerger skipped] Refactor Power VTS in terms of AIDL version am: 87f9c220b5 -s ours am: b2c1536da9 -s ours
am skip reason: Merged-In I3cef31fa8dc6341a47d173a13d07521bafe4a1e5 with SHA-1 42027e0ee7 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3298492

Change-Id: Ia6030e58c30837ad386cb5e52dbdbdfda4ae4e76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-09 07:54:51 +00:00
jimmyshiu
afeb6bbb8c [automerger skipped] VTSHalPowerTarget: check if HintSession supported am: f5a213c5ed -s ours
am skip reason: Merged-In Ia1161aeafcd541745e7e0da1bd4c1781dc535460 with SHA-1 92e08f9387 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3269678

Change-Id: I92fcf31cad3022e32292717a874039be69666660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-09 07:40:50 +00:00
Tomasz Wasilczyk
16e747fe60 Remove unused global const variable am: 6dc643db27
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3298493

Change-Id: I881c63488eee3a8dbe796f0d0d5912b929391b08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-09 07:40:42 +00:00
Matt Buckley
b2c1536da9 [automerger skipped] Refactor Power VTS in terms of AIDL version am: 87f9c220b5 -s ours
am skip reason: Merged-In I3cef31fa8dc6341a47d173a13d07521bafe4a1e5 with SHA-1 42027e0ee7 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3298492

Change-Id: I304305f50a7449495bf97b6920cc31c2b771846f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-09 07:40:38 +00:00
jimmyshiu
f5a213c5ed VTSHalPowerTarget: check if HintSession supported
Igore HintSession testcases while HintSession isn't supported.

Test: atest Power/PowerAidl
Bug: 322112957
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8191575b6717e99d00b247c6a21b29cda7eb3a52)
Merged-In: Ia1161aeafcd541745e7e0da1bd4c1781dc535460

Change-Id: Ia1161aeafcd541745e7e0da1bd4c1781dc535460
2024-10-08 09:24:03 +00:00
Tomasz Wasilczyk
6dc643db27 Remove unused global const variable
Bug: 175635923
Test: MODULES-IN-hardware-interfaces-power
Change-Id: Ie73f48df62a17b309c774b2f446db3ee53b3863b
2024-10-08 09:23:54 +00:00
Matt Buckley
87f9c220b5 Refactor Power VTS in terms of AIDL version
Rewrite Power VTS check support using AIDL versions instead of
API versions, and change hint session tests to use a common test
fixture.

Bug: 294917526
Test: atest VtsHalPowerTargetTest
Merged-In: I3cef31fa8dc6341a47d173a13d07521bafe4a1e5
Change-Id: I3cef31fa8dc6341a47d173a13d07521bafe4a1e5
2024-10-08 09:23:23 +00:00
Treehugger Robot
2e8727bba3 Merge "Add VTS for setAudioPortConfig with invalid gain" into main am: 0a2b52b3e4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3297282

Change-Id: I45b5f91134e554d5f3f3f104bfc832b625552998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-07 23:10:51 +00:00
Treehugger Robot
0a2b52b3e4 Merge "Add VTS for setAudioPortConfig with invalid gain" into main 2024-10-07 22:34:42 +00:00
Weilin Xu
349aea2127 Add VTS for setAudioPortConfig with invalid gain
Added test for setAudioPortConfig with invalid gain input in audio HAL
VTS. Also added HAL version check in audio HAL VTS.

Bug: 336370745
Test: atest VtsHalAudioCoreTargetTest
(cherry picked from commit 7f1ab0c33c)
Merged-In: I0f14c203c253de56ca0c3711927b2dcafa1b0ea7
Change-Id: Ib0b0d7266e249359f2750412f3fbabe1b2be958e
2024-10-07 14:57:24 -07:00
Mikhail Naganov
1f25a8df6f Merge "audio: Add AC-4 level 4 audio format to schema" into main am: ee843ed4a2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3206076

Change-Id: I3e9276d8e2388578b3f62cf3e6c7a24090398430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-07 21:51:59 +00:00
Mikhail Naganov
ee843ed4a2 Merge "audio: Add AC-4 level 4 audio format to schema" into main 2024-10-07 21:29:15 +00:00
Mikhail Naganov
d79467cd04 Merge "audio: Do not use StreamSwitcher for StreamRemoteSubmix" into main am: ea4241bda3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3294772

Change-Id: I33b9bbf7c2065fa6fa0ee43b466e140ea97288c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-07 17:33:03 +00:00
Mikhail Naganov
ea4241bda3 Merge "audio: Do not use StreamSwitcher for StreamRemoteSubmix" into main 2024-10-07 17:01:08 +00:00
Fang Hui
8c428d7ad2 ExternalCameraHAL: Get old image if taking picture without preview
The root cause is that the dequeue/queue v4l2 buffers is driven by requests.

The potential issue is already noticed and commented in commented in OutputThread::threadLoop().
But setup a sensor thread may need change in architecture.

The patch fix the issue by dropping too old buffers.

Bug: 368087676

Change-Id: I5d6711bc3a73d0bc043b596aee6ce4af4c1841da
Signed-off-by: Fang Hui <hui.fang@nxp.com>
2024-10-05 17:50:49 +08:00
Mikhail Naganov
e976625a49 audio: Do not use StreamSwitcher for StreamRemoteSubmix
Since use of StreamSwitcher causes the worker thread to be changed
during connected device change, its use must be avoided. We intend
to remove StreamSwitcher completely in future.

Bug: 300130515
Bug: 338974476
Bug: 368723297
Bug: 369272078
Bug: 369289912
Bug: 369964381
Test: atest CtsMediaAudioTestCases
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I4f6fd35f69d73641a86e1102f1d30d5e8f626e8f
2024-10-04 18:51:46 -07:00
Yu Shan
925c374a4f Fix unknown VehicleApPowerStateReport ON. am: 51d6329919
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3293934

Change-Id: I84ad985e136237e96ea97840c87ea980499a16a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-05 01:21:03 +00:00
Yu Shan
51d6329919 Fix unknown VehicleApPowerStateReport ON.
Fix an incorrect error message for VehicleApPowerStateReport ON.

Flag: EXEMPT HAL fix
Test: Manual test
Bug: 371614400
Change-Id: I81406931d27e2f8b174b52720d4f502e0e32fdd4
2024-10-04 14:20:08 -07:00
Treehugger Robot
14a843b9af Merge "audio: Do not use StreamSwitcher for StreamPrimary" into main am: 50956bd1cf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3291961

Change-Id: I3eab3b90c77ef1ff3595dad1f3672450c4b85a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-03 22:12:29 +00:00
Treehugger Robot
50956bd1cf Merge "audio: Do not use StreamSwitcher for StreamPrimary" into main 2024-10-03 21:48:38 +00:00
Devin Moore
1724c844be [automerger skipped] Add a new known hash to drm am: 8fc1714797 -s ours am: 34a3c0bdc9 -s ours
am skip reason: Merged-In I9e90ada03144b49245dc6b55a0fb2fa2eb6f3893 with SHA-1 2ae7fb6e55 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3291162

Change-Id: I1be1aa722a618965740bd143831b2af4d622d47b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-03 00:19:40 +00:00
Mikhail Naganov
f5ec73e546 audio: Do not use StreamSwitcher for StreamPrimary
Since use of StreamSwitcher causes the worker thread to be changed
during connected device change, its use for the primary HAL streams
must be avoided. The reason is that switching of the FMQ reader thread
accompanied with simultaneous writes from two writers: one on the
framework side, another on the HAL side sending the "exit" command,
violates threading assumptions of blocking FMQ and causes spurious
races that eventually make FMQ non-functional.

Bug: 300130515
Bug: 368723297
Bug: 369272078
Bug: 369289912
Bug: 369964381
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I14dc6fc08ae9e8aaaf3cd80e96b20dd1df54f633
2024-10-02 17:11:43 -07:00
Devin Moore
34a3c0bdc9 [automerger skipped] Add a new known hash to drm am: 8fc1714797 -s ours
am skip reason: Merged-In I9e90ada03144b49245dc6b55a0fb2fa2eb6f3893 with SHA-1 2ae7fb6e55 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3291162

Change-Id: Ic761e2a46814ba2f0ed4cd289ae45f7f87d11ec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-02 23:51:04 +00:00
Devin Moore
8fc1714797 Add a new known hash to drm
The types were split into another package so some newer devices are
using this new package.

The topic was cherry-picked but the branch configs made a mess. So we
are only cherry-picking this new hash for tests.

The new hash is added first, because the last hash in the file is
expected to the be current hash.

Bug: 293945485
Bug: 364817993
Test: build cuttlefish on this branch

Merged-In: I9e90ada03144b49245dc6b55a0fb2fa2eb6f3893
Change-Id: I6d3ef12301532d8b3fb8729abbbe6bd2dde86c91
2024-10-02 22:51:27 +00:00
Weilin Xu
3f214e8ae0 Enable bus device audio in default audio HAL am: 21c8770923
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3291581

Change-Id: I9d6135831a4e787572a276cd66e8464304c34df4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-02 20:29:50 +00:00
Weilin Xu
21c8770923 Enable bus device audio in default audio HAL
Bug: 336370745
Test: atest VtsHalAudioCoreTargetTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e9f7cf5a8495d11d92760bac5238eedb9dd5ea72)
Merged-In: I7d9ab165f3208f401a9889623050374ed6aea691
Change-Id: I7d9ab165f3208f401a9889623050374ed6aea691
2024-10-02 19:35:32 +00:00
Ryan Prichard
4dd9c44df9 Merge "VtsHalMediaOmx: avoid std::set and std::vector of const T" into main am: 649bddba90
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3288108

Change-Id: Icc5d7c0a312c4842504d3564e62e543e7f4bcfde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-02 19:30:48 +00:00
Ryan Prichard
649bddba90 Merge "VtsHalMediaOmx: avoid std::set and std::vector of const T" into main 2024-10-02 19:11:38 +00:00
Treehugger Robot
7831886039 Merge "Implement volume control on default audio HAL" into main am: 81d86fcd51
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3291222

Change-Id: I7984cd4599ee8c9d75b2a6336072fc733f533c8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-02 19:00:29 +00:00
Treehugger Robot
ab17d88eb7 Merge "Support multiple output devices in refrence audio HAL" into main am: 09b66d053e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3291062

Change-Id: I16ff52f05bb6cdff9d1b4dba7852058754fbca49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-02 19:00:23 +00:00
Andy Hung
3960c4c6fe Merge "Revert "Add a new known hash to drm"" into main am: cb609a748c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3291223

Change-Id: I0dde7bc6b763b51b7883346900cd72e395365dc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-02 18:57:42 +00:00
Treehugger Robot
81d86fcd51 Merge "Implement volume control on default audio HAL" into main 2024-10-02 18:48:11 +00:00
Treehugger Robot
09b66d053e Merge "Support multiple output devices in refrence audio HAL" into main 2024-10-02 18:48:11 +00:00