Commit graph

47534 commits

Author SHA1 Message Date
David Drysdale
da606360cc Merge "KeyMint: use a smaller invalid IMEI value" into main am: 955fb9e5fc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2694950

Change-Id: I9b15adef6651cf9c35062c4b0bdaeecfef5c1ad9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 10:53:48 +00:00
David Drysdale
955fb9e5fc Merge "KeyMint: use a smaller invalid IMEI value" into main 2023-08-08 10:16:23 +00:00
Treehugger Robot
a9d915c5a7 Merge "audio: Implement the major functionality of the primary CF HAL" into main am: ff1f1f3494
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2695367

Change-Id: Iee943e26ddde7f586e021a722579ed14ef81e5a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 08:40:30 +00:00
Treehugger Robot
ff1f1f3494 Merge "audio: Implement the major functionality of the primary CF HAL" into main 2023-08-08 07:56:05 +00:00
Treehugger Robot
67869eb176 Merge "audio: Ensure proper priority and scheduler for service threads" into main am: 41243dc213
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2696137

Change-Id: Iaad0376514ff74a8daa1b6bb20956ba7aa9b0acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 03:04:14 +00:00
Treehugger Robot
41243dc213 Merge "audio: Ensure proper priority and scheduler for service threads" into main 2023-08-08 02:19:23 +00:00
Mikhail Naganov
4bf6899cc7 audio: Ensure proper priority and scheduler for service threads
Change audio worker threads priority to ..._URGENT_AUDIO to match
the coupled thread in the audio flinger.

Set SCHED_FIFO scheduler for FAST threads (also to match AF fast
mixer/capture threads). In order to enable that, grand SYS_NICE
capability to the HAL service process and provide "getTid"
function in the StreamWorker class. For testing, add a "FAST"
output to the "stub" module in the HAL configuration.

Bug: 286914845
Test: atest libaudioaidlcommon_test
Test: atest VtsHalAudioCoreTargetTest
Test: adb shell ps -A -T -o PID,TID,NI,PCY,PRI,RTPRIO,SCHED,CMD
      for the HAL service process during VTS test. For regular
      "reader"/"writer" threads should see 'NI 19, PRI 38',
      for FAST "writer" should see 'NI -19, PRI 43, RTPRIO 3, SCH 1'
Change-Id: Iab7e21ebc139ff11cf9b7f4a1645960db8dadd43
2023-08-07 18:15:19 -07:00
Treehugger Robot
1f232a1cc4 Merge "Update version for audiocontrol" into main am: 203ca985ce
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2695272

Change-Id: If528b5b568a4d2573e00149ec755a748259d3735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 23:42:11 +00:00
Treehugger Robot
203ca985ce Merge "Update version for audiocontrol" into main 2023-08-07 22:59:39 +00:00
Mikhail Naganov
cf824f65c8 audio: Implement the major functionality of the primary CF HAL
Core HAL changes:

1. Add StreamPrimary implemented via StreamAlsa.

2. Align the configuration with the HIDL HAL.

3. Fix position retrieval vs. standby call.

4. Fix sleeps in StreamAlsa.

VTS changes:

1. Use several bursts for stream I/O test scenarios that check
   observable position increase. This is because the position may
   not be available until a couple of transfers have been made.

2. Do not require position increase for the scenarios that do
   not make several bursts. As specified above, the position may
   not have been increased for the ALSA case. Whereas, using
   multiple bursts in all scenarios will increase test time, and
   make the state machine transitions graph more complicated.

3. Hook up the test config file to shut down audioserver during
   VTS tests, fix the test config file.

Bug: 286914845
Test: atest VtsHalAudioCoreTargetTest
Test: compare APM dumps for AIDL vs. HIDL
Change-Id: I85271564c664fa40008d60e82b32eaa66a99c68f
2023-08-07 13:38:50 -07:00
David Drysdale
0215cb3d3e KeyMint: use a smaller invalid IMEI value
The invalid value used for the second IMEI attestation test is
potentially wrong in two ways:
- It doesn't match the provisioned value.
- It's not a valid IMEI, not least because it is longer than 16 bytes.

Make the test value shorter so the second failure doesn't apply and
the test can reliably expect CANNOT_ATTEST_IDS.

Bug: 292959871
Test: VtsAidlKeyMintTargetTest
Change-Id: If8c6b9e08b48e6caf5c767578e1ac43964214619
2023-08-07 11:53:46 +01:00
kuanyuhuang
2194196c50 BT: add LOW_LATENCY mode if low latency allowed am: 25b4819e08
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2696655

Change-Id: If285a6296927f8d886a8398779cd4216f9d083ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 06:59:12 +00:00
kuanyuhuang
25b4819e08 BT: add LOW_LATENCY mode if low latency allowed
LatencyMode is not updatable after audio session started.
Currently, if low latency is allowed, audio session should have
LOW_LATENCY latency mode.
Create a workaround to add LOW_LATENCY when low_latency_allowed_ set to
ture at ReportLowLatencyModeAllowedChanged.

Bug: 291760415
Bug: 294498919
Test: play low latency audio with supported headset and check
LOW_LATENCY mode can be selected

Change-Id: Ia324f0a368e47ae8b8056c190d8d1f4a2e09ecec
2023-08-07 05:05:52 +00:00
Yifan Hong
980a0781a7 matrices: automotive.audiocontrol in 7.xml has max version am: 966a4f13a5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2688072

Change-Id: Idd95c933262c3defbcc921457be47291f67cd1c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-05 01:58:17 +00:00
Yifan Hong
a2f7b02a8c Merge "fcm_exclude: split HIDL and AIDL predicate." into main am: 23847d4411
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2688566

Change-Id: I1aeadeb5e6f6f2d90d7e539178ee75adeafab31e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-05 00:07:41 +00:00
Terry Guan
b324444c8a Update version for audiocontrol
Bug: 255369346
Bug: 255383566
Test: atest vts_treble_vintf_vendor_test
Change-Id: I17000be75963e511d2a56583be0f619a3dee66f1
Merged-In: I17000be75963e511d2a56583be0f619a3dee66f1
Merged-In: Ic42e51b616782a2763eb80e1cad5ca776cc079d4
2023-08-04 16:50:58 -07:00
Yifan Hong
966a4f13a5 matrices: automotive.audiocontrol in 7.xml has max version
Updates version from 1 to 1-2 to reflect the fact
that version 2 is released in Android 13.

Test: TH
Bug: 255383566
Change-Id: I290aefb51fcc54d5e5a02f8c7da5876e86f61cd9
2023-08-04 16:47:29 -07:00
Yifan Hong
23847d4411 Merge "fcm_exclude: split HIDL and AIDL predicate." into main 2023-08-04 23:16:13 +00:00
Treehugger Robot
d621a32f12 Merge "audio: Make renamings suggested by reviewers" into main am: e8d695d9b2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2693226

Change-Id: I2b70cb3dc8ee4e828c9a6621d334da2bad98ff22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 16:34:58 +00:00
Treehugger Robot
e8d695d9b2 Merge "audio: Make renamings suggested by reviewers" into main 2023-08-04 15:46:13 +00:00
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
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