Commit Graph

45061 Commits

Author SHA1 Message Date
Seth Moore
8c66a64da3 Merge changes I844f3e88,Ia4feb8ce,Ia87d3ea0 am: 9dc8e53e7c am: a6f9c76492
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2347407

Change-Id: Ia29d6228abfd2e066afc9bf0b5b3819b70a96270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 00:38:35 +00:00
Seth Moore
a6f9c76492 Merge changes I844f3e88,Ia4feb8ce,Ia87d3ea0 am: 9dc8e53e7c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2347407

Change-Id: I48970d5ce4f9898db4188bd18c8c49be9147e35a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 00:09:08 +00:00
Seth Moore
9dc8e53e7c Merge changes I844f3e88,Ia4feb8ce,Ia87d3ea0
* changes:
  Add RKP-specific owners file
  Enable RKP+KeyMint integration test
  Move remotely provisioned component tests to rkp directory
2022-12-13 23:41:30 +00:00
Seth Moore
34d856e8f7 Add RKP-specific owners file
Test: N/A
Change-Id: I844f3e88b2b89337d843f63e63c9dcbcbb921b77
2022-12-13 13:26:41 -08:00
Seth Moore
7dc1fda7a4 Enable RKP+KeyMint integration test
This integration was technically a requirement on keymint v2, but we
weren't enforcing it with a test. So realistically we are only able
to start enforcing the test with keymint v3.

Test: atest VtsAidlKeyMintTargetTest
Change-Id: Ia4feb8ce4b7fd1e47a5c6c9b06ddb12276a9c5ee
2022-12-13 13:25:32 -08:00
Automerger Merge Worker
abca95888a Merge "Merge "audio: Bring default HAL configuration closer to cuttlefish" am: b55e63fb51" into stage-aosp-master am: 08add363f6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2338913

Change-Id: Ib1348602088e51c57565550e5677d2f2de7a238e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 20:13:29 +00:00
Treehugger Robot
49918b51f2 Merge "audio: Bring default HAL configuration closer to cuttlefish" am: b55e63fb51 am: e1f576c20b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2338913

Change-Id: I7a85d26c2948a7c1979148db132e2e95268451df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 20:12:49 +00:00
Automerger Merge Worker
08add363f6 Merge "Merge "audio: Bring default HAL configuration closer to cuttlefish" am: b55e63fb51" into stage-aosp-master 2022-12-13 19:38:51 +00:00
Treehugger Robot
5c21e47011 Merge "audio: Bring default HAL configuration closer to cuttlefish" am: b55e63fb51
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2338913

Change-Id: Iaa1167a383bd50f32762ff821aa5bef2335caff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 19:38:44 +00:00
Treehugger Robot
e1f576c20b Merge "audio: Bring default HAL configuration closer to cuttlefish" am: b55e63fb51
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2338913

Change-Id: Ie18c10fa64217fbe0981de28233f24434565d4e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 19:38:42 +00:00
Treehugger Robot
b55e63fb51 Merge "audio: Bring default HAL configuration closer to cuttlefish" 2022-12-13 19:30:00 +00:00
Seth Moore
8f810b1303 Move remotely provisioned component tests to rkp directory
Now that the RKP HAL AIDL has been moved to it's own directory, we
should keep the tests with the AIDL.

Test: atest VtsAidlKeyMintTargetTest
Test: atest VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: Ia87d3ea0a1b9e6704f0dea8f98b0bbaa049472fe
2022-12-13 11:03:59 -08:00
Eran Messeri
7e4f6d49be Merge "Update the KeyMint feature version to 300" am: 7536e36ded am: 2b9d1d1770
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2332347

Change-Id: I94e986ea44d29a288e6b9813812376f112cd6ae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 18:54:32 +00:00
Eran Messeri
2b9d1d1770 Merge "Update the KeyMint feature version to 300" am: 7536e36ded
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2332347

Change-Id: Id8c8bc42b1823ed21bc3dc1f55ea50abf037d433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 18:22:02 +00:00
Eran Messeri
7536e36ded Merge "Update the KeyMint feature version to 300" 2022-12-13 17:58:17 +00:00
Shunkai Yao
ace21c4c9e Merge "Effect AIDL: queryEffect with Descriptor for all effects implementation" am: f0a217d07a am: 8918d907d1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2344310

Change-Id: Ifc1abc3b759f657226c05b55fe47b7f28d4543ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 16:26:33 +00:00
Shunkai Yao
28ebaad709 Effect AIDL: update IFactory.queryEffects to return Descriptor am: 20e5c1733e am: 67c43d9dcf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2344309

Change-Id: Ib9d8a5bb6079acdd811cebec340718ca6a6ad9fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 16:26:30 +00:00
Shunkai Yao
8918d907d1 Merge "Effect AIDL: queryEffect with Descriptor for all effects implementation" am: f0a217d07a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2344310

Change-Id: I01844a874231d6b573cc3a492253cb67bb2773cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 15:55:03 +00:00
Shunkai Yao
67c43d9dcf Effect AIDL: update IFactory.queryEffects to return Descriptor am: 20e5c1733e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2344309

Change-Id: I5dc54cd51099b812ca0ae5b9e6bbc3e0ea7472a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 15:54:58 +00:00
Shunkai Yao
f0a217d07a Merge "Effect AIDL: queryEffect with Descriptor for all effects implementation" 2022-12-13 15:29:14 +00:00
Shunkai Yao
20e5c1733e Effect AIDL: update IFactory.queryEffects to return Descriptor
Add queryEffect for effect libraries.
Change Descriptor in each effect implementation to be static so
extern C function can access.

Bug: 261646550
Test: atest VtsHalAudioEffectTargetTest
Change-Id: Id7badec592becf37b27be6022106f443e5976880
2022-12-13 02:46:54 +00:00
Shunkai Yao
c12e0821e6 Effect AIDL: queryEffect with Descriptor for all effects implementation
Add queryEffect for effect libraries.
Change Descriptor in each effect implementation to be static so
extern C function can access.
Update vts test cases.

Bug: 261646550
Test: atest VtsHalAudioEffectTargetTest
Change-Id: I8e5d7240db31a0d09b17541c39d9e4c15e1eea73
2022-12-13 02:46:40 +00:00
Darren Hsu
669cec9444 Merge "powerstats: add new EnergyConsumerType for camera" am: 72a3964894 am: c92826db99
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2335183

Change-Id: I00141dbd210e22c1119f8fddd2c6aca749dc8575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 02:03:22 +00:00
Darren Hsu
c92826db99 Merge "powerstats: add new EnergyConsumerType for camera" am: 72a3964894
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2335183

Change-Id: Ia20ed50b69597a943ed271095c9d928480d0d091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 01:32:58 +00:00
Mikhail Naganov
c8e4312da8 audio: Bring default HAL configuration closer to cuttlefish
This is to simplify switching of cuttlefish to
the AIDL implementation. Split out 'r_submix' module.

Add all IModule instance names to the compatibility
matrix.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I424db14257281671eea87aa743deb778ca75f388
2022-12-13 01:17:55 +00:00
Darren Hsu
72a3964894 Merge "powerstats: add new EnergyConsumerType for camera" 2022-12-13 00:50:42 +00:00
Treehugger Robot
b0c30781d1 Merge "identity: Add support for ECDSA auth and don't require session encryption." am: 4c02ef2b4e am: 8aaa7f0911
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2241333

Change-Id: I966624d31c5132603fd837e2a7ae97783f5f6e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 23:42:20 +00:00
Lorena Torres-Huerta
f5ff4af2e3 Merge changes from topic "engineConfigHalInterface" am: 2ea44dd872 am: 13e798ddec
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2288257

Change-Id: I2ac779d25ebe568619e7f4592219a36c55e667c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 23:41:06 +00:00
Lorena Torres-Huerta
6915317e3f Add engine configuration to the AIDL Audio HAL interface. am: db11b2db44 am: 9e79190b8f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2215431

Change-Id: I515575245fe3404fbd0d6b6f19ac95241dd1ef2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 23:41:04 +00:00
Lorena Torres-Huerta
6a7fdc5ef2 Merge "VTS for IConfig getEngineConfig" am: 00be453d3a am: 4d91ad0364
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2288057

Change-Id: I7e0fff03355845bac0d6dfbdaaa7fa3588d223ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 23:40:59 +00:00
Treehugger Robot
8aaa7f0911 Merge "identity: Add support for ECDSA auth and don't require session encryption." am: 4c02ef2b4e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2241333

Change-Id: Ia055667f3967492be14a7bcf0f330d7399f18711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 23:14:28 +00:00
Lorena Torres-Huerta
13e798ddec Merge changes from topic "engineConfigHalInterface" am: 2ea44dd872
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2288257

Change-Id: If7f093fa47384894f0724206ca979bdbfade90b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 23:09:40 +00:00
Lorena Torres-Huerta
9e79190b8f Add engine configuration to the AIDL Audio HAL interface. am: db11b2db44
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2215431

Change-Id: If172d08a6fe2705aa9a307b6c7098cacb8d54279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 23:09:37 +00:00
Lorena Torres-Huerta
4d91ad0364 Merge "VTS for IConfig getEngineConfig" am: 00be453d3a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2288057

Change-Id: I17e77689254641be135724e46d0b98959579706d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 23:09:34 +00:00
Treehugger Robot
4c02ef2b4e Merge "identity: Add support for ECDSA auth and don't require session encryption." 2022-12-12 23:06:06 +00:00
Lorena Torres-Huerta
2ea44dd872 Merge changes from topic "engineConfigHalInterface"
* changes:
  Default implementation for IConfig engine configuration.
  Add engine configuration to the AIDL Audio HAL interface.
2022-12-12 22:41:36 +00:00
Lorena Torres-Huerta
00be453d3a Merge "VTS for IConfig getEngineConfig" 2022-12-12 22:41:36 +00:00
Lorena Torres-Huerta
aff8a1f8fd VTS for IConfig getEngineConfig
Bug: 242678729
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I051d0778bbad447e49dd4b99a2797333d0d67862
2022-12-12 19:34:39 +00:00
Yu Shan
2f3325628a Avoid holding lock while calling recurrent actions. am: 417ca2541a
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/20682672

Change-Id: Ifa21b22ec2d6f9c1b2eb567ff2f5d0a3ebd1919e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 03:51:12 +00:00
Shunkai Yao
a46a60cf5e Merge changes from topic "aidl_effect_lock" am: 6900a3c936 am: d1bd493ce0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2306265

Change-Id: I0d0fa19d2165cb14c5cd51bc90c8fb2098911b6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 02:18:24 +00:00
Treehugger Robot
043542d1fd Merge "AIDL effect: Add effect AIDL vts to presubmit" am: 2aa6c215dd am: 8eb0e98b85
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2336331

Change-Id: I14a562f9a7cd7cc8ff586226d29e041fdcc6b3a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 02:18:11 +00:00
Automerger Merge Worker
744fd70336 Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: 5098382441 -s ours
am skip reason: Merged-In I4fe9ddd1c22ebfff03f5660ec9b01de2521f8533 with SHA-1 3ee79d5a46 is already in history

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

Change-Id: I3d91d4fcf5261b96b1a1bbedba75dd3c89ab6694
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 02:00:38 +00:00
Xin Li
8c63b0a0dd [automerger skipped] Merge "Merge Android 13 QPR1" am: 995144c4d5 -s ours am: 187e1a4190 -s ours
am skip reason: Merged-In I4fe9ddd1c22ebfff03f5660ec9b01de2521f8533 with SHA-1 3ee79d5a46 is already in history

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

Change-Id: Iac9e6f2fb9999c62cc80346aa5691e3aa968d87f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 01:57:44 +00:00
Shunkai Yao
d1bd493ce0 Merge changes from topic "aidl_effect_lock" am: 6900a3c936
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2306265

Change-Id: I4cc7362679c3b98223ed0d8944e433ecfd14e3e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 00:52:09 +00:00
Treehugger Robot
8eb0e98b85 Merge "AIDL effect: Add effect AIDL vts to presubmit" am: 2aa6c215dd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2336331

Change-Id: I7424947a1b6040ea7543b20e7eff1aba17b30e66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 00:51:22 +00:00
Shunkai Yao
6900a3c936 Merge changes from topic "aidl_effect_lock"
* changes:
  AIDL Effect: Update locking in EffectImpl
  AIDL Effect: Update vts test cases naming to remove timestamp.
  AIDL: Add BassBoost strength range in AIDL definition.
2022-12-10 00:33:01 +00:00
Xin Li
ea405a7ad8 [automerger skipped] Merge "Merge Android 13 QPR1" am: 995144c4d5 -s ours am: a9e4f399f1 -s ours
am skip reason: Merged-In I4fe9ddd1c22ebfff03f5660ec9b01de2521f8533 with SHA-1 3ee79d5a46 is already in history

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

Change-Id: I26c032b67c0f46a0c3be1a528ff7c2c2452e0308
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 00:28:02 +00:00
Treehugger Robot
2aa6c215dd Merge "AIDL effect: Add effect AIDL vts to presubmit" 2022-12-10 00:27:06 +00:00
Xin Li
4290797aed [automerger skipped] Merge Android 13 QPR1 am: 34eab1cf79 -s ours am: 6d2b3a28ef -s ours
am skip reason: Merged-In I4fe9ddd1c22ebfff03f5660ec9b01de2521f8533 with SHA-1 3ee79d5a46 is already in history

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

Change-Id: I43cd7d403432993791a116e32561b28a255f475a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 00:25:05 +00:00
Automerger Merge Worker
5098382441 Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master
* changes:
  [automerger skipped] Merge "Merge Android 13 QPR1" am: 995144c4d5 -s ours
  [automerger skipped] Merge Android 13 QPR1 am: 34eab1cf79 -s ours
2022-12-09 23:29:45 +00:00