Commit Graph

44979 Commits

Author SHA1 Message Date
TreeHugger Robot
e6c4e7992e Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" 2022-07-21 21:19:09 +00:00
Frankie Lizcano
87ccf77f90 Merge "Improve VTS: Allow Extra Filters for Live and Playback" 2022-07-21 18:38:21 +00:00
Bob Badour
4ae40f5b58 [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  automotive/vehicle/aidl/impl/default_config/config/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I2aca43eea19ea7bf43b34133e0dda79a54cefa90
2022-07-21 11:22:54 -07:00
Automerger Merge Worker
7cbe26c2d5 Merge "Allowing OMX.google* codecs for Devices launching with S am: 1e8510120f am: 50f251af37 am: e11e06d37a" into tm-d1-dev-plus-aosp am: 87deced98f am: c3334d0bbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19369555

Change-Id: I0becc85e60d38567d254c12657341526fe4773e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 09:54:02 +00:00
Arun Johnson
29f883126e Allowing OMX.google* codecs for Devices launching with S am: 1e8510120f am: 50f251af37 am: 178fb6be7e am: c6cec3e90c am: 4a0de8c302
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19369555

Change-Id: I09adccfd942b452b9ff3a90d30ad61279e5654b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 09:53:53 +00:00
Arun Johnson
096ad97539 Allowing OMX.google* codecs for Devices launching with S am: 1e8510120f am: 50f251af37 am: 178fb6be7e am: 949a28f82f am: b60c02590d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19369555

Change-Id: Ie956a0a849274195167cc2f9c1ac45c085e2a915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 09:53:42 +00:00
Arun Johnson
4029a3ee95 Allowing OMX.google* codecs for Devices launching with S am: 1e8510120f am: 50f251af37 am: 5222442817
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19369555

Change-Id: Idc0d9a650cc8e58da6e740f9b5bacd899c209693
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 09:36:38 +00:00
Automerger Merge Worker
c3334d0bbe Merge "Allowing OMX.google* codecs for Devices launching with S am: 1e8510120f am: 50f251af37 am: e11e06d37a" into tm-d1-dev-plus-aosp am: 87deced98f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19369555

Change-Id: If7fe5d3d6a1bce78f56c39f46ea7edac179eac17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 09:28:24 +00:00
Arun Johnson
4a0de8c302 Allowing OMX.google* codecs for Devices launching with S am: 1e8510120f am: 50f251af37 am: 178fb6be7e am: c6cec3e90c
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19369555

Change-Id: I5643409dd73d5e69ae1895e33d19e22a1140c740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 09:27:37 +00:00
Arun Johnson
b60c02590d Allowing OMX.google* codecs for Devices launching with S am: 1e8510120f am: 50f251af37 am: 178fb6be7e am: 949a28f82f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19369555

Change-Id: I89d3db8c7c053d206a9ca20137b9482470d0838f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 09:27:20 +00:00
Automerger Merge Worker
87deced98f Merge "Allowing OMX.google* codecs for Devices launching with S am: 1e8510120f am: 50f251af37 am: e11e06d37a" into tm-d1-dev-plus-aosp 2022-07-21 09:11:39 +00:00
Arun Johnson
949a28f82f Allowing OMX.google* codecs for Devices launching with S am: 1e8510120f am: 50f251af37 am: 178fb6be7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19369555

Change-Id: I30ca591148de2d311e1f9fc29a9210965c966840
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 09:11:37 +00:00
Arun Johnson
c6cec3e90c Allowing OMX.google* codecs for Devices launching with S am: 1e8510120f am: 50f251af37 am: 178fb6be7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19369555

Change-Id: I4215ae005c5c33205976a7ebd41fc1f2adf7f2e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 09:11:34 +00:00
Arun Johnson
fea722f890 Allowing OMX.google* codecs for Devices launching with S am: 1e8510120f am: 50f251af37 am: e11e06d37a
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19369555

Change-Id: Ib5290a5b63d22e5d1907b44385616d55e7e91c4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 09:11:34 +00:00
Arun Johnson
178fb6be7e Allowing OMX.google* codecs for Devices launching with S am: 1e8510120f am: 50f251af37
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19369555

Change-Id: Icd116490b789c78d94088e8e34893f7161c3025f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 08:53:37 +00:00
Arun Johnson
5222442817 Allowing OMX.google* codecs for Devices launching with S am: 1e8510120f am: 50f251af37
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19369555

Change-Id: I988cdad126911ccec7322cf4b3a197f3b42e6b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 08:52:59 +00:00
Arun Johnson
e11e06d37a Allowing OMX.google* codecs for Devices launching with S am: 1e8510120f am: 50f251af37
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19369555

Change-Id: I306890a1067eeebfedd4ebc0d5a3c65fbd6a7e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 08:52:10 +00:00
Arun Johnson
50f251af37 Allowing OMX.google* codecs for Devices launching with S am: 1e8510120f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19369555

Change-Id: I348d06c8b0a5f64f5fa9bab7df59a1a7bca60c52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 08:36:08 +00:00
David Drysdale
7abc58c001 Merge "Docs: return EARLY_BOOT_ENDED instead of INVALID_KEY_BLOB." am: 6796c8b5aa am: e76000e09b am: ff1e1dd319 am: fe425baf3d am: e447078024
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2160639

Change-Id: I41b7c86d6078d843bd4b4c1f5ec406448343f9d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 06:18:53 +00:00
David Drysdale
e447078024 Merge "Docs: return EARLY_BOOT_ENDED instead of INVALID_KEY_BLOB." am: 6796c8b5aa am: e76000e09b am: ff1e1dd319 am: fe425baf3d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2160639

Change-Id: Ie679a10401ae15a14ca70562c094b5cf56b37652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 06:02:26 +00:00
David Drysdale
fe425baf3d Merge "Docs: return EARLY_BOOT_ENDED instead of INVALID_KEY_BLOB." am: 6796c8b5aa am: e76000e09b am: ff1e1dd319
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2160639

Change-Id: Icf39f28ddbccb9e15340ffd5ec816b01e459d6f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 05:45:50 +00:00
David Drysdale
ff1e1dd319 Merge "Docs: return EARLY_BOOT_ENDED instead of INVALID_KEY_BLOB." am: 6796c8b5aa am: e76000e09b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2160639

Change-Id: I57114806e1b3f8ca60bf1e2d770cd95382e447fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 05:28:53 +00:00
David Drysdale
e76000e09b Merge "Docs: return EARLY_BOOT_ENDED instead of INVALID_KEY_BLOB." am: 6796c8b5aa
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2160639

Change-Id: I038bf7c4590425e88e4611dd36f4f6f3a0e35c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 05:11:57 +00:00
David Drysdale
6796c8b5aa Merge "Docs: return EARLY_BOOT_ENDED instead of INVALID_KEY_BLOB." 2022-07-21 04:52:46 +00:00
Rucha Katakwar
687f931b13 Update the HAL side about torch max level safety. am: 87a2e092ae am: b43f5efd3c am: 29285e0f22
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19347559

Change-Id: I3691e906b423c195227e01697a90d28a48d21f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 00:31:44 +00:00
Rucha Katakwar
4b76688fd7 Update the HAL side about torch max level safety. am: 87a2e092ae am: 2ca2d808e0 am: 69f0be42b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19347559

Change-Id: I16b95ead67d08011ab59c706fa04203493cbdae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 00:31:28 +00:00
Rucha Katakwar
29285e0f22 Update the HAL side about torch max level safety. am: 87a2e092ae am: b43f5efd3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19347559

Change-Id: I87c576079ec80a260560ac8ae38acbbf946809dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 00:03:47 +00:00
Rucha Katakwar
69f0be42b6 Update the HAL side about torch max level safety. am: 87a2e092ae am: 2ca2d808e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19347559

Change-Id: Iad6bb25369c6e193c8247b832d3d698ae69b14b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 00:03:11 +00:00
Frankie Lizcano
d2c09c4703 Improve VTS: Allow Extra Filters for Live and Playback
This CL allows vendors to specify extra filters they would like to
include in the Live dataflow. Note, however, that these filters are not
included in any integration tests yet, as those will come later.

Additionally, this CL cleans up the code originally used to configure
extra filters for DVR playback. It converts the code and API strucutre
to a uniform format consistent with that of other dataflows that allow
extra filters.

Bug: b/239751563

Test: vts-tradefed run vts --module VtsHalTvTunerTargetTest
Change-Id: I662814666873254eff84791b5057da1f44f5e73e
2022-07-21 00:02:35 +00:00
Rucha Katakwar
b43f5efd3c Update the HAL side about torch max level safety. am: 87a2e092ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19347559

Change-Id: I41e0f78f2c03e05de1cf657fbe8314ca1dc227cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 23:48:22 +00:00
Rucha Katakwar
2ca2d808e0 Update the HAL side about torch max level safety. am: 87a2e092ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19347559

Change-Id: Ia984ee30ec31d4d7e09b652515965bfffe8990b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 23:48:05 +00:00
Sarah Chin
de21d04c01 [automerger skipped] VTS setSystemSelectionChannels maintain current state am: e5e0792e97 -s ours am: bdb46a0f27 -s ours am: 4cf918fc62 -s ours am: 720273a82d -s ours am: 6e33801f12 -s ours
am skip reason: Merged-In If261f548da102963130b8cd669eb6392c9270f9a with SHA-1 479ec9e172 is already in history

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

Change-Id: I3eb8ef662ca21325631198273eaaf9c6db3c1604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 22:23:20 +00:00
Sarah Chin
6e33801f12 [automerger skipped] VTS setSystemSelectionChannels maintain current state am: e5e0792e97 -s ours am: bdb46a0f27 -s ours am: 4cf918fc62 -s ours am: 720273a82d -s ours
am skip reason: Merged-In If261f548da102963130b8cd669eb6392c9270f9a with SHA-1 479ec9e172 is already in history

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

Change-Id: I7856938d4db68f2536b4ac475be62c9c9e5b00bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 22:03:38 +00:00
Sarah Chin
720273a82d [automerger skipped] VTS setSystemSelectionChannels maintain current state am: e5e0792e97 -s ours am: bdb46a0f27 -s ours am: 4cf918fc62 -s ours
am skip reason: Merged-In If261f548da102963130b8cd669eb6392c9270f9a with SHA-1 479ec9e172 is already in history

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

Change-Id: Idfa0cb3540078913fe285a0149d4490bcd7d9ad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 21:39:24 +00:00
Sarah Chin
4cf918fc62 [automerger skipped] VTS setSystemSelectionChannels maintain current state am: e5e0792e97 -s ours am: bdb46a0f27 -s ours
am skip reason: Merged-In If261f548da102963130b8cd669eb6392c9270f9a with SHA-1 479ec9e172 is already in history

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

Change-Id: Ifb8ceb4a4767248ba6c0888bfd8f8631c7d085f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 21:23:07 +00:00
Sarah Chin
bdb46a0f27 [automerger skipped] VTS setSystemSelectionChannels maintain current state am: e5e0792e97 -s ours
am skip reason: Merged-In If261f548da102963130b8cd669eb6392c9270f9a with SHA-1 479ec9e172 is already in history

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

Change-Id: I25de355a23fb983c39ff5c22f6cb6d86e24fe1ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 21:04:20 +00:00
Arun Johnson
1e8510120f Allowing OMX.google* codecs for Devices launching with S
S AOSP did not remove the OMX.google* codecs, so this cannot be
enforced for devices launching with S

bug: 230582620
Change-Id: I25e8f827645db8e83c8c3142f5e76a912fdf7b22
(cherry picked from commit 6973e79b91)
2022-07-20 20:45:01 +00:00
Subrahmanyaman
0b9c196214 Docs: return EARLY_BOOT_ENDED instead of INVALID_KEY_BLOB.
All attempts to use an EARLY_BOOT_ONLY key after earlyBootEnded()
is called must fail with Error::EARLY_BOOT_ENDED.

Test: run vts -m VtsAidlKeyMintTarget
Change-Id: Ic3d028ceb7f71e6e266993ec4e877770cd8e5c4a
2022-07-20 17:26:12 +00:00
Sarah Chin
e5e0792e97 VTS setSystemSelectionChannels maintain current state
Test: atest VtsHalRadioTargetTest
Bug: 231271472
Change-Id: If261f548da102963130b8cd669eb6392c9270f9a
Merged-In: If261f548da102963130b8cd669eb6392c9270f9a
2022-07-20 00:16:45 -07:00
Sean Hong
b0b5f05d11 Merge "Remove FOG_LIGHTS_SWITCH from the emulator for the CTS test" into tm-qpr-dev am: ebafec193f am: ebb8dc655a
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19245760

Change-Id: I53e16522932d34ab619e5f6e926ead41ca9ddb83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 04:06:29 +00:00
Sean Hong
ebb8dc655a Merge "Remove FOG_LIGHTS_SWITCH from the emulator for the CTS test" into tm-qpr-dev am: ebafec193f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19245760

Change-Id: I4df568e5375fa99d5f4b9160f5d8db46c77033f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 03:40:01 +00:00
Sean Hong
ebafec193f Merge "Remove FOG_LIGHTS_SWITCH from the emulator for the CTS test" into tm-qpr-dev 2022-07-20 03:24:32 +00:00
Rucha Katakwar
87a2e092ae Update the HAL side about torch max level safety.
Bug: 239492786
Change-Id: I59dc2acc89c617be4551a4d92494a47b782d5e13
2022-07-19 15:42:35 -07:00
Elliott Hughes
04dc244bbf Merge "Fix incorrect indentation." am: 5609b7b260 am: f53c50c542 am: bf38ee601b am: 4b4f74e408 am: f2d4f56846
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2159656

Change-Id: Ibcd02888a418e42c38c7d84568ed9db735d61e44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 22:13:49 +00:00
Elliott Hughes
f2d4f56846 Merge "Fix incorrect indentation." am: 5609b7b260 am: f53c50c542 am: bf38ee601b am: 4b4f74e408
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2159656

Change-Id: Ic414e3031913a1a124a92204760f68bcf5b06e99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 21:54:36 +00:00
Elliott Hughes
4b4f74e408 Merge "Fix incorrect indentation." am: 5609b7b260 am: f53c50c542 am: bf38ee601b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2159656

Change-Id: I233402da6a4aadd9d35b8a92b9328d132c220a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 21:30:24 +00:00
Elliott Hughes
bf38ee601b Merge "Fix incorrect indentation." am: 5609b7b260 am: f53c50c542
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2159656

Change-Id: Iddd9822ef6a85981e156ba0b75ed497f9c6a60b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 21:04:56 +00:00
Elliott Hughes
f53c50c542 Merge "Fix incorrect indentation." am: 5609b7b260
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2159656

Change-Id: Iac1a5985a30670d043dd70f5531e3bfdfa652cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 20:45:33 +00:00
Steven Moreland
7102fcd369 [automerger skipped] VehicleManager: use with RefBase am: 0a19e588f0 -s ours am: 4482b06080 -s ours am: bdd1c8e6ae -s ours am: abc540da30 -s ours am: a014f4bbd7 -s ours
am skip reason: Merged-In Id6b3b7e222980fd0e82b2d94ff2518e92d42a4d9 with SHA-1 5769163d4b is already in history

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

Change-Id: I1a1a2eeefedd654429dfaea64fbe9c2b0f4c1b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 20:36:48 +00:00
Elliott Hughes
5609b7b260 Merge "Fix incorrect indentation." 2022-07-19 20:21:08 +00:00