Commit Graph

59845 Commits

Author SHA1 Message Date
Yu Shan
bc3c135e3c Merge "Fix AIDL VHAL metadata extraction script" into main am: 355e79f1b4 am: 0a68ab7149
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2890512

Change-Id: I9a755c96342734492ea19dca654a38902927e483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 23:18:24 +00:00
Yu Shan
0a68ab7149 Merge "Fix AIDL VHAL metadata extraction script" into main am: 355e79f1b4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2890512

Change-Id: I85d5a3115cc188c9a33700291305300d91cf511d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 22:33:43 +00:00
Shunkai Yao
0432cf90ee Merge "Update comment about headTrackingSensorId" into main am: 42876b8011 am: 04a73fca69
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2896201

Change-Id: Ib358a6cbd417fde2e079b51911dfcde98a97baa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 22:15:35 +00:00
Yu Shan
355e79f1b4 Merge "Fix AIDL VHAL metadata extraction script" into main 2024-01-03 21:55:29 +00:00
Shunkai Yao
04a73fca69 Merge "Update comment about headTrackingSensorId" into main am: 42876b8011
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2896201

Change-Id: I76088205be2a424a8663802f2ed66d2bed04e0aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 21:44:44 +00:00
Shunkai Yao
42876b8011 Merge "Update comment about headTrackingSensorId" into main 2024-01-03 21:22:18 +00:00
Treehugger Robot
e1fced6967 Merge "Audio Effect VTS: run Dowmmix data path test only after HAL version 2" into main am: 8c00013594 am: 76268cc57d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2894923

Change-Id: Ie59e64bec5d8488c438ed16c470780f5e9fec4b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 21:10:43 +00:00
Treehugger Robot
76268cc57d Merge "Audio Effect VTS: run Dowmmix data path test only after HAL version 2" into main am: 8c00013594
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2894923

Change-Id: Ibe9fe3475d928a2bb6ddcfa0b92fbde56c82286d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 20:40:52 +00:00
Shunkai Yao
d090afe1af Update comment about headTrackingSensorId
Bug: 317405349
Test: m, aidl-format
Change-Id: I5f4b0e931c073d87b1a30a55c39e614d24a63030
2024-01-03 19:50:15 +00:00
Treehugger Robot
36af76605f Merge "Camera: Add missing characteristics for using buffermanager in ExternalCamera" into main am: 4103ef0c5a am: 5151c1f477
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2884368

Change-Id: I78b8342906cea80ed61c59d69ae2e2dc2f395a0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 19:48:41 +00:00
Treehugger Robot
8c00013594 Merge "Audio Effect VTS: run Dowmmix data path test only after HAL version 2" into main 2024-01-03 19:45:02 +00:00
Treehugger Robot
5151c1f477 Merge "Camera: Add missing characteristics for using buffermanager in ExternalCamera" into main am: 4103ef0c5a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2884368

Change-Id: Idf40f617b46e3d156688ff3dce5cc1869e4db748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 19:19:47 +00:00
Treehugger Robot
4103ef0c5a Merge "Camera: Add missing characteristics for using buffermanager in ExternalCamera" into main 2024-01-03 18:59:01 +00:00
Shunkai Yao
6b7784edfe Audio Effect VTS: run Dowmmix data path test only after HAL version 2
Bug: 315074570
Test: VtsHalDownmixTargetTest
Change-Id: Iaa17519521f136901ec217f7d5b5fd0d03889533
2024-01-03 18:46:00 +00:00
Spandan Das
49d6218b24 Merge "Make availability to com.android.tethering explicit" into main am: bce73c83b0 am: bb3348a42d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2889306

Change-Id: Id7efdcc207cde0cd20230a8195fd1d2c1059fdf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 18:28:27 +00:00
Spandan Das
bb3348a42d Merge "Make availability to com.android.tethering explicit" into main am: bce73c83b0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2889306

Change-Id: I99842514c6927051aa8d1665985888d180d20267
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 18:16:37 +00:00
Spandan Das
bce73c83b0 Merge "Make availability to com.android.tethering explicit" into main 2024-01-03 17:46:31 +00:00
Victor Shutemov
1e14bd55bd Fix AIDL VHAL metadata extraction script
Add capability to process values from imports.
Update json metadata file with new data.

Testing:
1. cd hardware/interfaces/automotive/vehicle/aidl/emu_metadata
2. ./generate_emulator_metadata.py ../../aidl_property/android/hardware/automotive/vehicle out.json

Bug: 317529575
Test: manual
Change-Id: I315f1f75c2372796bde3bdacd39246344579c002
2024-01-03 13:25:57 +01:00
Yu Shan
8151b3c1c1 Merge "Fixed spelling mistake in LaneCenteringAssistCommand" into main am: 5df990f75d am: c231cfb6c2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2890071

Change-Id: I6b9f35eb6530ac915def56ebc4d362838b50ce92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-29 01:54:27 +00:00
Yu Shan
c231cfb6c2 Merge "Fixed spelling mistake in LaneCenteringAssistCommand" into main am: 5df990f75d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2890071

Change-Id: Ifbd09507c02781353519dc376c355bb03affb478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-29 01:23:45 +00:00
Yu Shan
5df990f75d Merge "Fixed spelling mistake in LaneCenteringAssistCommand" into main 2023-12-29 01:00:43 +00:00
Mikhail Naganov
9edfcbea4a Merge changes from topic "cuttlefish_aidl_audio-3" into main am: 5f50cd6320 am: 663f355b7a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2889786

Change-Id: I7f3ed749812d25f26c245dde92f1c187fcf5f5c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-29 00:01:12 +00:00
Mikhail Naganov
085ccd9f91 audio: Add test configs for effects VTS tests am: b80de7bcd7 am: ca98d3982f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2890072

Change-Id: I5fe5acebff28fe2d0bc5bdf06dc1697f9d2b1fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-29 00:01:08 +00:00
Mikhail Naganov
663f355b7a Merge changes from topic "cuttlefish_aidl_audio-3" into main am: 5f50cd6320
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2889786

Change-Id: I377058af53f2ac65941da6c84deb22d688fd9562
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-28 23:32:26 +00:00
Mikhail Naganov
ca98d3982f audio: Add test configs for effects VTS tests am: b80de7bcd7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2890072

Change-Id: Ia1b3c1aa17fd406f7246a58373437eeb0cae1ba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-28 23:32:15 +00:00
Mikhail Naganov
5f50cd6320 Merge changes from topic "cuttlefish_aidl_audio-3" into main
* changes:
  Revert "Add remote submix direct paths"
  audio: Add test configs for effects VTS tests
2023-12-28 22:53:57 +00:00
Steven Moreland
20c1948aa5 Merge "BufferPoolClient: avoid dereference null accessor" into main am: 85333361c1 am: 71d3a7ccbc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2889801

Change-Id: I9e01d6c66e2459ed9f58451a73e586145ea6cbe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-28 04:21:55 +00:00
Steven Moreland
71d3a7ccbc Merge "BufferPoolClient: avoid dereference null accessor" into main am: 85333361c1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2889801

Change-Id: I4b1dbf1a83ca968af93e860ed92baaec5640b51c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-28 03:51:29 +00:00
Steven Moreland
85333361c1 Merge "BufferPoolClient: avoid dereference null accessor" into main 2023-12-28 03:16:32 +00:00
Mikhail Naganov
b80de7bcd7 audio: Add test configs for effects VTS tests
The main purpose of the config is to shut down the framework
audioserver while the VTS test is running. This is achieved by
setting 'vts.native_server.on' to '1'. Without this, restarts
of the effects HAL process which are a normal part of tests
affect the audioserver and may lead to failures of framework
tests that run interleaved with these VTS tests.

Bug: 264712385
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts
Change-Id: I2515cb62e46ef8e93cbddb2c0219f4523d2ecda5
2023-12-27 15:54:30 -08:00
Mikhail Naganov
27719f12e8 Revert "Add remote submix direct paths"
This reverts commit ce9767a966.

Please see the comment on aosp/2832731. This configuration
leads to anomalous framework behavior.

Bug: 311830316
Test: atest audiorouting_tests
Change-Id: I5be3ac18819e297aa199c5a0f5d2e85758448b4b
2023-12-27 15:54:30 -08:00
Steven Moreland
483e69f4eb BufferPoolClient: avoid dereference null accessor
Bug: 308739058
Test: N/A
Change-Id: I568e9d82976a1f7d7278748f347a17eb6f93fc79
2023-12-27 22:55:36 +00:00
Tyler Trephan
35bf32ff0f Fixed spelling mistake in LaneCenteringAssistCommand
Test: None
Bug: 290972334
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:077e36dee61db38ad8d0e28a62542e571e2921ae)
Merged-In: Ic85ba803abe349ea9a7edd7dca5cbe7159df34ac
Change-Id: Ic85ba803abe349ea9a7edd7dca5cbe7159df34ac
2023-12-27 20:02:52 +00:00
Mikhail Naganov
78d8c4dd50 Merge changes from topic "fix-aidl-mix-ports-and-bt" into main am: eafa78c929 am: 002c58fafd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2877679

Change-Id: I1cd3e1d4a6f045112687ec25e0b59ab3a7af931b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-27 04:36:33 +00:00
Mikhail Naganov
f48e129f55 audio r_submix: Suggest configuration from the peer am: 3b732895a8 am: de6a93d47d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2886671

Change-Id: If90ca7bc18bec69a447f1497d9530579aafabd1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-27 04:36:28 +00:00
Mikhail Naganov
a667344e8c audio: Refactor configuration population am: a92039ac48 am: 8cb953b071
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2886670

Change-Id: I6f625d2a1339762e08533ae05ff73741d743de6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-27 04:36:23 +00:00
Mikhail Naganov
002c58fafd Merge changes from topic "fix-aidl-mix-ports-and-bt" into main am: eafa78c929
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2877679

Change-Id: I5c39c9531794b3193d2a477c6854cd676475ad99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-27 04:05:15 +00:00
Mikhail Naganov
de6a93d47d audio r_submix: Suggest configuration from the peer am: 3b732895a8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2886671

Change-Id: I6f7aecbe65da1a4ea555e812c640a2b3b43f7fff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-27 04:05:12 +00:00
Mikhail Naganov
8cb953b071 audio: Refactor configuration population am: a92039ac48
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2886670

Change-Id: I3594561197a36aa377816458ab1a324ee61410da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-27 04:05:07 +00:00
Mikhail Naganov
eafa78c929 Merge changes from topic "fix-aidl-mix-ports-and-bt" into main
* changes:
  audio: Fix BT AIDL HAL module implementation
  audio r_submix: Suggest configuration from the peer
  audio: Refactor configuration population
2023-12-27 03:42:02 +00:00
Mikhail Naganov
a88cf60b87 audio: Fix BT AIDL HAL module implementation
In order to align with legacy behavior, when opening a stream,
the module must suggest the current configuration of the BT session.
For that to work, the BT device proxy must be opened prior
to creating a stream, code moved to ModuleBluetooth.

Fix minor inconsistencies and bugs found during testing.

Bug: 301213930
Bug: 316027906
Test: atest pts-bot
Change-Id: I04ddaf73be82f872a3f32a789563c3cbd648eb61
2023-12-26 16:34:58 -08:00
Mikhail Naganov
3b732895a8 audio r_submix: Suggest configuration from the peer
When there is a pipe established for a remote submix
device, suggest the configuration of the peer when opening
the other end.

Refactor SubmixRoute management to move it out from
StreamRemoteSubmix so that ModuleRemoteSubmix could also
use it.

Bug: 294962274
Test: atest audiorouting_tests
Change-Id: Ib31a662e7b65b92c614dc441a01160cae3485f3a
2023-12-26 10:31:43 -08:00
Ray Chin
f7600caa46 [automerger skipped] Blind scan should be an optional feature based on the design document am: 58be11ecc4 am: d9ae7baed7 am: 455a392349 am: cadece5c20 -s ours
am skip reason: Merged-In Id0153700cfa2c02933c23e13ca1305b0a96b00ca with SHA-1 58be11ecc4 is already in history

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

Change-Id: Idfbd34343c2e2287be7194ea518003e328591123
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-26 09:19:54 +00:00
Ray Chin
cadece5c20 Blind scan should be an optional feature based on the design document am: 58be11ecc4 am: d9ae7baed7 am: 455a392349
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2890674

Change-Id: I9dcabe4d3de6c1946a788362839e97245a1fba7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-26 08:47:34 +00:00
Ray Chin
3e445a9e9c Blind scan should be an optional feature based on the design document am: 58be11ecc4 am: 8ef6a81771 am: aab0081f60
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2890674

Change-Id: I5b8e81a14547dc9f3aba32f23c4db06522e58d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-26 08:45:53 +00:00
Ray Chin
455a392349 Blind scan should be an optional feature based on the design document am: 58be11ecc4 am: d9ae7baed7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2890674

Change-Id: I3b45d0621819dc4ecc20d917b572666d11260225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-26 08:12:43 +00:00
Ray Chin
aab0081f60 Blind scan should be an optional feature based on the design document am: 58be11ecc4 am: 8ef6a81771
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2890674

Change-Id: I87a120394521e0f878be88d1ee5a3d8d837db99f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-26 07:58:31 +00:00
Ray Chin
d9ae7baed7 Blind scan should be an optional feature based on the design document am: 58be11ecc4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2890674

Change-Id: Idae0c0db7705d18b63c179f5ac977579f358b357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-26 07:40:38 +00:00
Ray Chin
8ef6a81771 Blind scan should be an optional feature based on the design document am: 58be11ecc4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2890674

Change-Id: I99083d453ebc4e41b46f40abbbf883f254312f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-26 07:27:41 +00:00
Ray Chin
58be11ecc4 Blind scan should be an optional feature based on the design document
Bug: 317215552
Bug: 305118733
Test: cf_x86_tv-staging-userdebug
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:740a0a8c5ebd0218139aded763fb3204886c2dd0)
Merged-In: Id0153700cfa2c02933c23e13ca1305b0a96b00ca
Change-Id: Id0153700cfa2c02933c23e13ca1305b0a96b00ca

NOTE FOR REVIEWERS - errors occurred while applying the patch.
PLEASE REVIEW CAREFULLY.
Errors:
Error applying patch in tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.cpp, hunk HunkHeader[1258,6->1262,10]: Hunk cannot be applied

Original patch:
 From 740a0a8c5e Mon Sep 17 00:00:00 2001
From: Ray Chin <raychin@google.com>
Date: Fri, 22 Dec 2023 19:10:46 +0800
Subject: [PATCH] Blind scan should be an optional feature based on the design document

Bug: 317215552
Bug: 305118733
Test: cf_x86_tv-staging-userdebug
Change-Id: Id0153700cfa2c02933c23e13ca1305b0a96b00ca
---
2023-12-26 10:28:05 +08:00