Commit graph

54139 commits

Author SHA1 Message Date
Treehugger Robot
826b04099f Merge "Remove authsecret HIDL entry in compat matrix." into main am: 5a15a1c838
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2691186

Change-Id: If77c197dd51f81e25040bda04526cb8c11aac399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 22:46:25 +00:00
Treehugger Robot
5a15a1c838 Merge "Remove authsecret HIDL entry in compat matrix." into main 2023-08-03 22:12:23 +00:00
Mikhail Naganov
459b7331e9 audio: Make renamings suggested by reviewers
Rename DriverInterface::getPosition -> refinePosition. This reflects
the fact that the driver may provide more precise position, however
this is an optional operation.

Rename StreamIn/Out::mContext -> mContextInstance. This is
to emphasize that StreamIn/Out actually own the context and they
hold the real context instance, not just a reference/pointer
to it, like other classes involved in the inheritance chain.

Bug: 286914845
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Id7159f9bf3ee020dc7cf594ec35f5d59d23d7e31
2023-08-03 10:31:12 -07:00
Mikhail Naganov
581cd68e17 Merge "audio: Address comments from an internal review" into main am: 09d45c473e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2691166

Change-Id: I5c9f4d436433fd22dda7c70cd39741d5606ad762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 16:46:56 +00:00
Mikhail Naganov
09d45c473e Merge "audio: Address comments from an internal review" into main 2023-08-03 15:58:56 +00:00
Yu Shan
f29d9e5d9e [RESTRICT AUTOMERGE] Pass property set error to subscribed clients. am: 21d7b02a9a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2640752

Change-Id: I7545eb634ed00ad24e98a5ca16de16566153a5cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 23:27:36 +00:00
Yu Shan
21d7b02a9a [RESTRICT AUTOMERGE] Pass property set error to subscribed clients.
Pass the async property set error generated by VehicleHardware layer
to subscribed clients.

Test: atest DefaultVehicleHalTest
Bug: 286384730
Bug: 292001021
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6fe26625db72da7760014d0c71019fb3e847e2d3)
Merged-In: Iadd92e1c0c741ad6450a0508fe9e6301bdfe66c5
Change-Id: Iadd92e1c0c741ad6450a0508fe9e6301bdfe66c5
2023-08-02 22:03:41 +00:00
Eran Messeri
5fe06ea215 Add VSR annotation to KeyMint tests
Add VSR annotations for the KeyMint v2 and KeyMint v3 requirements.

Bug: 251242992
Test: N/a
Change-Id: I0cf5eff86fe18df6f567b30d697af01bc8cdbb4e
2023-08-02 22:34:24 +01:00
Devin Moore
aa8b667844 Remove authsecret HIDL entry in compat matrix.
This interface has been converted to AIDL.

Test: TH
Bug: 218588089
Change-Id: I091ff4acb38c42821e99f785404e922d7b71ffa2
Merged-In: I091ff4acb38c42821e99f785404e922d7b71ffa2
2023-08-02 20:02:33 +00:00
Treehugger Robot
830e95f8dd Merge "Audio r_submix : Handle the usecase when no data is available to read." into main am: 0bc307a5dd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2686486

Change-Id: I2c42b7029dc17c57fe14db15bbd57891c6e7ff53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 19:25:49 +00:00
Mikhail Naganov
0faf339425 audio: Address comments from an internal review
Bug: 286914845
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I2f636c77f67fdd8eeac70dd304848bf7f76db4e5
2023-08-02 12:24:47 -07:00
Treehugger Robot
0bc307a5dd Merge "Audio r_submix : Handle the usecase when no data is available to read." into main 2023-08-02 18:51:53 +00:00
Treehugger Robot
155c316265 Merge changes from topic "bluetoothmodule" into main am: 4bfa2e1e6d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2677924

Change-Id: Ia2ad2cf0b2257db1d281f3ace920c79cd937ae80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 18:02:07 +00:00
Ram Mohan
0ae83a3952 bluetooth: Fix dependency on android.hardware.audio.common am: f6497dd78c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2678077

Change-Id: Ib7cce5259054773b6510452ce40f60aa7eaa9152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 18:02:04 +00:00
Treehugger Robot
d505445445 Merge changes from topic "bluetoothmodule" into main am: 169be3476d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2640450

Change-Id: I32935ddf4f4d1b12ad7a9e842971fe68aca7747b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 18:02:01 +00:00
Mikhail Naganov
412aafd1eb aosp aidl bluetooth audio hal implementation am: b03b5c4a06
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2624193

Change-Id: Ic1acd04cc6c73a96b40329524e45740f8660efbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 18:01:55 +00:00
François Gaffie
2b10decfc0 Audio: add system usage to audio policy engine schemas am: acd4a677f0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2689186

Change-Id: I300d132d79ace1fe572ca47a5cb4c17b947e1330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 17:59:30 +00:00
Treehugger Robot
4bfa2e1e6d Merge changes from topic "bluetoothmodule" into main
* changes:
  bluetooth: Add AudioSession/Control methods for AIDL track metadata
  bluetooth: Fix dependency on android.hardware.audio.common
2023-08-02 17:41:07 +00:00
Treehugger Robot
169be3476d Merge changes from topic "bluetoothmodule" into main
* changes:
  aosp aidl bluetooth parameter support
  aosp aidl bluetooth audio hal implementation
2023-08-02 17:41:07 +00:00
Mikhail Naganov
b03b5c4a06 aosp aidl bluetooth audio hal implementation
Bug: 228804498
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Id5fb60fe53ead9f5d2e6ecbb9988a23835cf2509
2023-08-02 21:42:01 +05:30
Ram Mohan
18f0d5121a aosp aidl bluetooth parameter support
Bug: 228804498
Test: atest VtsHalAudioCoreTargetTest
Change-Id: If1820018d5a6750eed0d0b486e15fc7c717aa11c
2023-08-02 21:42:01 +05:30
François Gaffie
acd4a677f0 Audio: add system usage to audio policy engine schemas
Bug: 293917986
Test: m

Change-Id: I49a8d3cfeb45eddc95ad6ab4a33b0adf0585cde2
Signed-off-by: François Gaffie <francois.gaffie@renault.com>
2023-08-02 10:47:00 +02:00
Shraddha Basantwani
675cce24d6 Audio r_submix : Handle the usecase when no data is available to read.
Bug: 290116295
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Ifd6706d593f890dd8ae148523a37177774c8ffd4
2023-08-02 05:19:24 +00:00
Yifan Hong
32f40c34ef fcm_exclude: split HIDL and AIDL predicate.
AIDL is going to have a new format in fcm_exclude:
android.hardware.foo@1. This cannot be excluded
properly when mixing with HIDL, so split.

Test: TH
Bug: 255383566
Change-Id: I3df9517f12b62f5112df307528d5c3deab12cfa0
2023-08-01 16:05:40 -07:00
Wonsik Kim
af716e2365 Merge changes from topic "cherrypicker-L17700000962261813:N11400001392188571" into main am: b93626c412
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2680665

Change-Id: Ib4cc051e79aede054c04c2423581cb0c84fce702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 20:43:09 +00:00
Sungtak Lee
f3b8d9c2d2 AIDL BufferPool implementation (HIDL -> AIDL) am: 8878a13271
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2680664

Change-Id: Ie58b365383d0dc48090004d83d639d1f8466b342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 20:43:04 +00:00
Sungtak Lee
d0e142bc3d AIDL bufferpool implementation (just copy from HIDL impl) am: 97e1dfb99d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2680937

Change-Id: I5446ba56eec88bb55aaa70f9a5df1356e7738a2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 20:43:00 +00:00
Sungtak Lee
9db9300059 bufferpool2: Support mainline s/w codec am: e3d399b3ac
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2680663

Change-Id: I1bb315a3a7597b6b7aa631ba2905bad2f8e85381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 20:42:56 +00:00
Sungtak Lee
ff6d622f29 bufferpool2: add sync() method and etc am: 72b2b38c7f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2684986

Change-Id: I07ffb9918f51791b70233bc8bc04d4fcb8b90424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 20:42:53 +00:00
Ram Mohan
f6497dd78c bluetooth: Fix dependency on android.hardware.audio.common
Make android.hardware.bluetooth.audio-V3 and
VtsHalBluetoothAudioTargetTest to depend on
android.hardware.audio.common-V2. This is needed so that
the audio HAL service can depend on
android.hardware.bluetooth.audio-V3.

Bug: 228804498
Test: m
Change-Id: Ic001e651de4cc6ef6920f1d6d80ab272c45aefe2
Merged-In: Ic001e651de4cc6ef6920f1d6d80ab272c45aefe2
2023-08-01 13:38:47 -07:00
Mikhail Naganov
d5f0d13ef0 bluetooth: Add AudioSession/Control methods for AIDL track metadata
Add overloads for UpdateSink/SourceMetadata that
accept android.hardware.audio.common.Sink/SourceMetadata types.
Move include of hardware/audio.h to BluetoothAudioSession.cpp.
This allows to use this code from "pure AIDL" modules.

Bug: 228804498
Test: m
Change-Id: Ib0b8c6d1c7db9b846a508d6d4001f67feb2111c6
2023-08-01 13:38:47 -07:00
Wonsik Kim
b93626c412 Merge changes from topic "cherrypicker-L17700000962261813:N11400001392188571" into main
* changes:
  Support mainline s/w codec
  AIDL BufferPool implementation (HIDL -> AIDL)
  AIDL bufferpool implementation (just copy from HIDL impl)
  bufferpool2: Support mainline s/w codec
  bufferpool2: add sync() method and etc
2023-08-01 19:33:08 +00:00
Sungtak Lee
4c7908859c Support mainline s/w codec
Bug: 254050250
Test: m
Merged-In: Id160730a334bf09b91115ada2706c89e6b80192a
Change-Id: Id160730a334bf09b91115ada2706c89e6b80192a
2023-08-01 19:32:52 +00:00
Sungtak Lee
8878a13271 AIDL BufferPool implementation (HIDL -> AIDL)
Bug: 254050250
Test: m
Merged-In: I0d7bae2c01bd480d1e99f4b39c4a9013a2828897
Change-Id: I0d7bae2c01bd480d1e99f4b39c4a9013a2828897
2023-08-01 19:32:45 +00:00
Sungtak Lee
97e1dfb99d AIDL bufferpool implementation (just copy from HIDL impl)
Bug: 254050250
Test: no impact to build
Merged-In: I48841189a8743dcd6533a9e61581e48f0f1717f1
Change-Id: I48841189a8743dcd6533a9e61581e48f0f1717f1
2023-08-01 19:32:34 +00:00
Sungtak Lee
e3d399b3ac bufferpool2: Support mainline s/w codec
Bug: 254050250
Test: m
Merged-In: Id602b1a84880546ee726f36c247fabd2e4f2127c
Change-Id: Id602b1a84880546ee726f36c247fabd2e4f2127c
2023-08-01 19:32:15 +00:00
Sungtak Lee
72b2b38c7f bufferpool2: add sync() method and etc
Add sync() method to IConnection interface.
Add existing connection flag to return parcelable of
IClientManager::registerSender().
Use plain integer for returning fetch result status.

Bug: 254050250
Merged-In: Ifebd4b16e9b8c37e074e7126f39264a18fed5de8
Change-Id: Ifebd4b16e9b8c37e074e7126f39264a18fed5de8
2023-08-01 19:31:27 +00:00
Treehugger Robot
fa2b2f6cdc Merge changes I385860db,I52fc5134,Icfcea3d6 into main am: 4b64af21a0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2685250

Change-Id: I365b5e74049afcdac029c2238295baeaaa42d9dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 18:52:37 +00:00
Devin Moore
6a64a501d4 Freeze android.hardware.weaver am: e4716e8230
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2685249

Change-Id: I3d2fc8c028221d420e08e9060f6d8d126add9b46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 18:52:33 +00:00
Devin Moore
8ccf196a22 Freeze android.hardware.bluetooth.audio am: dfcd3bda4b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2685248

Change-Id: I3aa0b82690f1fed90c1d38b5770aa49d1881857d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 18:52:30 +00:00
Treehugger Robot
4b64af21a0 Merge changes I385860db,I52fc5134,Icfcea3d6 into main
* changes:
  Freeze android.hardware.power.stats
  Freeze android.hardware.weaver
  Freeze android.hardware.bluetooth.audio
2023-08-01 18:09:44 +00:00
Shraddha Basantwani
335037031d Audio r_submix : Replace usage of portId by device address am: 2e460345a2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2677975

Change-Id: I7fb16a97fa159ff715f6dbc3c19c94c2d11db514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 17:19:48 +00:00
Shraddha Basantwani
f901f6a465 Audio : Fix a few minor issues with stream switcher class am: 035beba203
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2680756

Change-Id: I42680884d9a0675065028500096d7b7dcc00ffdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 17:19:10 +00:00
Shraddha Basantwani
2e460345a2 Audio r_submix : Replace usage of portId by device address
Use stream switcher to obtain device address for creation
of a remote submix stream.

Bug: 286914845
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I8dde3d59e488c9621dce78ffd5249254ecfc0b1a
2023-08-01 12:06:38 +00:00
Shraddha Basantwani
035beba203 Audio : Fix a few minor issues with stream switcher class
1. Constructor should forward variable arguments
2. mContext initialization was missing
3. Add nullptr check for addEffect and removeEffect methods

Bug: 264712385
Bug: 286914845
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I4037292bf497be186b26508bd16846886fa4fe55
2023-08-01 12:06:20 +00:00
Devin Moore
567ed4f159 Freeze android.hardware.power.stats
This was done in ag/22462586 internally which is too large to
cherry-pick. It's being applied to aosp to unblock some trunk stable
work.

This CL is generated with:
`m android.hardware.power.stats-freeze-api`

Test: m
Bug: 290265210
Change-Id: I385860dbd7e0d183e159353b2e2d0f8fb5b444eb
Merged-In: I832ab7a8b5445ba85e27bbcf5be64906bfa0e5be
2023-07-31 23:48:01 +00:00
Devin Moore
e4716e8230 Freeze android.hardware.weaver
This was done in ag/22462586 internally which is too large to
cherry-pick. It's being applied to aosp to unblock some trunk stable
work.

This CL is generated with:
`m android.hardware.weaver-freeze-api`

Test: m
Bug: 290265210
Change-Id: I52fc5134a97d749b826b2f9318839369502ac85a
Merged-In: I832ab7a8b5445ba85e27bbcf5be64906bfa0e5be
2023-07-31 23:47:54 +00:00
Devin Moore
dfcd3bda4b Freeze android.hardware.bluetooth.audio
This was done in ag/22462586 internally which is too large to
cherry-pick. It's being applied to aosp to unblock some trunk stable
work.

This CL is generated with:
`m android.hardware.bluetooth.audio-freeze-api`

Test: m
Bug: 290265210
Change-Id: Icfcea3d6971dd0b91cd320d9995b70bcb38a3750
Merged-In: I832ab7a8b5445ba85e27bbcf5be64906bfa0e5be
2023-07-31 23:46:41 +00:00
William Escande
29120123a8 Sync wait for the bluetooth to be disabled / enabled
Bluetooth does not handle well conflicting message

Test: VtsHalBluetoothV1_0TargetTest
Test: VtsHalBluetoothV1_1TargetTest
Bug: 262645484
Bug: 262501652
Bug: 293822620
Change-Id: I0aca127fb5e5e33cc0086aaad19a8f1286fc83d6
(cherry picked from commit cd64ee13fb)
2023-07-31 06:40:19 +00:00
Hugo Drumond Jacob
62968d35df [automerger skipped] [DO NOT MERGE] Handle unavailable properties am: aeafec3db0 -s ours am: 373a052124 -s ours am: 28b2c1ad37 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5bb804f7794835cdc0730f9a7e53e18aa4498b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 14:40:07 +00:00