Commit graph

54140 commits

Author SHA1 Message Date
Xin Li
69861dd021 Clean up android.hardware.automotive.vehicle intermediates.
In ag/20886210, the VHAL properties were separated into a new AIDL
interface but the names remained the same.  In incremental builds with
pre-existing old versions of AIDL, these generated headers would remain
there and gets picked up due to include directory ordering.

Eliminate this possiblity by performing a cleanup of the generated
primary headers directory.

Merged-In: Ic5ef401b427b2772e8527b2dc9804781a51125be
Change-Id: Ic5ef401b427b2772e8527b2dc9804781a51125be
2023-08-25 13:29:36 -07:00
Xin Li
879960bdce Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I7b6fffac2ada0e039f79bad8cc9b4d954e9c3460
Change-Id: I9466127d8d0fa38df36ca99f704853b2db871e67
2023-08-25 13:29:30 -07:00
Treehugger Robot
ba6ec44f84 Merge "Only require RKP on T+ chipsets" into main am: 7bed173e4c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727994

Change-Id: I4c2bfcf4bddca10977b43a9c98bd05a38ae36479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 19:46:31 +00:00
Treehugger Robot
7bed173e4c Merge "Only require RKP on T+ chipsets" into main 2023-08-25 19:08:06 +00:00
Seth Moore
8be875e0d0 Only require RKP on T+ chipsets
It turns out we had a bug (b/263844771) in how RKP support was
detected, and that was fixed. However, due to this bug, some S chipests
shipped without RKP support which is now required by the tests.

This change drops the RKP requirement from S chipsets. There should be
no new S chipsets, so this effectively grandfathers in the previous
ones that were skipped by the RKP VTS tests.

T+ tests (both VTS and other suites) will verify that RKP support is
there, so there is no gap introduced by this change.

Bug: 297139913
Test: VtsAidlKeyMintTargetTest
Change-Id: I387e5f058ada698747aac103c1745682291f2d1c
2023-08-25 11:13:41 -07:00
Treehugger Robot
8f1eea8f9d Merge "Migrate from android::String isEmpty to empty" into main am: 8a21830735
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2707853

Change-Id: I2412bcaad2813af336b939c1f7b295224dec7bab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 17:01:44 +00:00
Treehugger Robot
8a21830735 Merge "Migrate from android::String isEmpty to empty" into main 2023-08-25 16:38:32 +00:00
Treehugger Robot
0e9c13a879 Merge "Fix typo in CDDL" into main am: ee6590ef2d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727733

Change-Id: Ia6dea8a826bce51165b931e0dcf4c5e9daab0fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 10:07:08 +00:00
David Drysdale
41580971d5 Merge "KeyMint: fix auth test HAT" into main am: 41bbc573f7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727633

Change-Id: I20656fb1ade0c7580f53944809bc3393cb582e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 10:06:17 +00:00
Treehugger Robot
ee6590ef2d Merge "Fix typo in CDDL" into main 2023-08-25 09:52:42 +00:00
David Drysdale
41bbc573f7 Merge "KeyMint: fix auth test HAT" into main 2023-08-25 09:45:42 +00:00
Alan Stokes
5004b8b5ae Fix typo in CDDL
Test: N/A
Change-Id: Iba25acb24306d36c97be07987857237363654bb5
2023-08-25 09:34:35 +01:00
Jooyung Han
2c6eb76638 Merge changes from topic "threadnetwork-apex" into main am: de60dd2ae5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2725097

Change-Id: I5b86509dd3b4c8be71fbd6bcfe2b537f9cd89022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 08:07:00 +00:00
Jooyung Han
3d9a2543f4 Mark threadnetwork HAL as updatable-via-apex am: 868b8968bf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2725096

Change-Id: Ia6abf433be42e602b77c42c5e67eaea6cb9bd883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 08:06:57 +00:00
Jooyung Han
4919cebcfb Add apexkey "com.android.hardware" am: 0b94777903
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2725095

Change-Id: I36b693aa4c15494f3b4b5a0c603fe798a31d5ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 08:06:52 +00:00
Jooyung Han
de60dd2ae5 Merge changes from topic "threadnetwork-apex" into main
* changes:
  Move threadnetwork HAL to VAPEX
  Mark threadnetwork HAL as updatable-via-apex
  Add apexkey "com.android.hardware"
2023-08-25 07:17:09 +00:00
David Drysdale
97272d8d5f KeyMint: fix auth test HAT
The test case for an auth-per-operation HAT with an invalid HMAC
is wrong -- it is re-using the previous HAT, which fails for a
different reason (has an old challenge).

Fix the test to use the HAT that's wrong in the intended way.

Bug: 297333975
Test: VtsAidlKeyMintTargetTest
Change-Id: I15fe9b0c1b53452df0f67dd44534fdb80a6c2a9c
2023-08-25 07:30:12 +01:00
Jooyung Han
aa32086a7e Merge "Mark nfc HAL as updatable-via-apex" into main am: a9c0dda341
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2724974

Change-Id: I12e22a5fdc9da6f1c72ed87be827cf24048f3e04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 23:26:57 +00:00
Jooyung Han
a9c0dda341 Merge "Mark nfc HAL as updatable-via-apex" into main 2023-08-24 23:02:06 +00:00
Shunkai Yao
8178aa5e83 Merge "Fix the audio source table in Processing" into main am: 84cfecd616
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2723934

Change-Id: Id3c0075f7048f08ac2b8845eb4ca0dbed9197744
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 21:28:28 +00:00
Shunkai Yao
84cfecd616 Merge "Fix the audio source table in Processing" into main 2023-08-24 21:11:05 +00:00
Treehugger Robot
9f52ca0fd2 Merge "Initialize mStopThread in Sensor constructor" into main am: 014b456a11
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2717101

Change-Id: I62883a8ec5d345b9da29d06beb9be0ac4eae2ebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 20:06:56 +00:00
Treehugger Robot
014b456a11 Merge "Initialize mStopThread in Sensor constructor" into main 2023-08-24 19:43:59 +00:00
Treehugger Robot
fcc06a7f6c Merge "Remove the limitation of max open streams" into main am: 4115d8b01d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2719933

Change-Id: I38ec098ea8e30ffe13b5f54ee77a8b0aff448023
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 19:31:00 +00:00
Treehugger Robot
4115d8b01d Merge "Remove the limitation of max open streams" into main 2023-08-24 19:29:36 +00:00
Treehugger Robot
773fe517cd Merge "Use String8/16 c_str [camera]" into main am: db1eba8e0c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2723316

Change-Id: I7b3f2c2c076038660815b226bebff28e450293dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 19:28:11 +00:00
Treehugger Robot
db1eba8e0c Merge "Use String8/16 c_str [camera]" into main 2023-08-24 18:56:09 +00:00
Tomasz Wasilczyk
38836b884b Migrate from android::String isEmpty to empty
This empty method is different from the old one - it aligns with
std::string definition.

Bug: 295394788
Test: make checkbuild
Change-Id: I98dad222b149e6052b7dc63c477d84c9eb011dd3
2023-08-24 18:49:22 +00:00
Treehugger Robot
7da95bfa92 Merge "Use String8/16 c_str [drm]" into main am: 3cc1fa796e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2723935

Change-Id: Id22d85863804914816e272fa74093da18de15a23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 18:44:08 +00:00
Aditya Chitnis
5d346fb79c Initialize mStopThread in Sensor constructor
Bug: 294653181
Bug: 294500012
Test: Presubmit
Change-Id: I9c9a9119eb75e364d3969ae77248370937f1f3c5
2023-08-24 18:41:36 +00:00
Treehugger Robot
3cc1fa796e Merge "Use String8/16 c_str [drm]" into main 2023-08-24 18:22:12 +00:00
Shunkai Yao
2461891a1c Remove the limitation of max open streams
Bug: 295055755
Test: atest CtsMediaAudioTestCases
Change-Id: Ifc0bec23ccc2845657389783194eb18fcc7884fa
2023-08-24 18:14:03 +00:00
Tomasz Wasilczyk
353d4c5c75 Use String8/16 c_str [camera]
Bug: 295394788
Test: make checkbuild
Change-Id: I7ca371112e891f4f40673b5c34e3b8ccc41841bf
Merged-In: I7ca371112e891f4f40673b5c34e3b8ccc41841bf
2023-08-24 17:07:46 +00:00
Treehugger Robot
ffca721517 Merge "Migrate String8|16.setTo to assignment operator" into main am: 16012b6b06
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2723937

Change-Id: Ib40634e2965299263eadffe4b395e4104068500b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 16:44:01 +00:00
Treehugger Robot
16012b6b06 Merge "Migrate String8|16.setTo to assignment operator" into main 2023-08-24 15:54:28 +00:00
Zhanglong Xia
779ddee8ba Merge "remove manually freeing the variable mDeathRecipient" into main am: f865a8b7cd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2725094

Change-Id: I0eebd4491b62a1998c39f017740a6d261fe80008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 10:13:41 +00:00
Zhanglong Xia
f865a8b7cd Merge "remove manually freeing the variable mDeathRecipient" into main 2023-08-24 09:18:59 +00:00
Jooyung Han
f8bd1f0b00 Move threadnetwork HAL to VAPEX
com.android.hardware.threadnetwork is a new VAPEX containing
threadnetwork HAL. It also includes ot-rcp.

Bug: 296966113
Test: vts-tf > run vts -m VtsHalTheadNetworkTargetTest
Change-Id: Id2028d755f9b0dcc06ccd817bddf3195efb5595b
2023-08-24 17:40:46 +09:00
Jooyung Han
868b8968bf Mark threadnetwork HAL as updatable-via-apex
Since it's not available in U, we don't have to mark it in 8.xml

Bug: 296966113
Test: m
Change-Id: I5ba313208c4c43c270fd4507f3e92cea6a62dc5e
2023-08-24 16:49:25 +09:00
Jooyung Han
0b94777903 Add apexkey "com.android.hardware"
This can be shared by many AOSP com.android.hardware.* APEXes defined in
hardware/interfaces.

Bug: 296524155
Test: m
Change-Id: I8d5bf7d9cf8fe4b502af9240027529d61c9776af
2023-08-24 16:47:11 +09:00
Zhanglong Xia
3297a174d6 remove manually freeing the variable mDeathRecipient
The variable `mDeathRecipient` will automatically free the allocated
memory when it is destructed. This CL deletes the code for manually
releasing the variable `mDeathRecipient` to avoid the same variable
being freed twice.

Bug: 296617022
Test: Run fuzzer test.
Change-Id: I733f7f8d26e48a9434d41c5098f39ad91208abeb
2023-08-24 15:38:05 +08:00
Jooyung Han
b5cae6c04a Mark nfc HAL as updatable-via-apex
Mark it in both 8.xml and 9.xml. 8.xml for -next configuration.

Bug: 296529752
Test: n/a
Change-Id: Ie96c38e30618cc343586f429a5d48e7108f90614
2023-08-24 14:18:57 +09:00
Treehugger Robot
c671181af8 Merge "Enable Rust backend for NFC AIDL HAL" into main am: e37ca01670
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648142

Change-Id: I3afe81b049081726f635c6e646e10eb28c2c6b8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 23:48:28 +00:00
Treehugger Robot
e37ca01670 Merge "Enable Rust backend for NFC AIDL HAL" into main 2023-08-23 23:32:46 +00:00
Treehugger Robot
cc476475f8 Merge "audio: Make IConfig.getSurroundSound default implementation more robust" into main am: 58d953e4be
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2723318

Change-Id: Ic9027ee666526f077b2402a0c7ccab8bd75f6775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 23:09:18 +00:00
Treehugger Robot
58d953e4be Merge "audio: Make IConfig.getSurroundSound default implementation more robust" into main 2023-08-23 22:31:08 +00:00
Tomasz Wasilczyk
17034e5f39 Migrate String8|16.setTo to assignment operator
Bug: 295394788
Test: make checkbuild
Change-Id: Ic98514f48399115046029e68883408090f0cd0db
2023-08-23 22:14:17 +00:00
Treehugger Robot
7eb27056c0 Merge "Use String8/16 c_str [security]" into main am: f646832675
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2723317

Change-Id: I9f8627267fb287974172345def38f5179615b57e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 21:51:10 +00:00
Treehugger Robot
f646832675 Merge "Use String8/16 c_str [security]" into main 2023-08-23 21:23:44 +00:00
Mikhail Naganov
1e25ef808f audio: Make IConfig.getSurroundSound default implementation more robust
In the case when there is a problem with the legacy APM XML file,
the converter provides a default surround sound config. However,
the default implementation of IConfig::getSurroundSoundConfig did
not take an advantage of that, and was returning an empty config,
which is not accepted by VTS.

Also, improve logging messages: clarify the situation when no readable
audio policy XML file found, and use outer functions name for lambdas.

Bug: 293978054
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Iae069a0498009605ef5ededb9c9112efab08548a
2023-08-23 14:18:27 -07:00