Snap for 11908474 from 8fe4b5974eeccf83958c16a8b111ed253ec63319 to 24Q3-release (74e19cee) · Commits · e / os / android_hardware_interfaces

audio/aidl/default/audio_effects_config.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,6 @@
		<effect name="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>
		<effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/>
		<effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
		<effect name="env_reverb" library="env_reverbsw" uuid="fa819886-588b-11ed-9b6a-0242ac120002"/>
		<effect name="reverb_env_aux" library="reverb" uuid="4a387fc0-8ab3-11df-8bad-0002a5d5c51b"/>
		<effect name="reverb_env_ins" library="reverb" uuid="c7a511a0-a3bb-11df-860e-0002a5d5c51b"/>
		<effect name="reverb_pre_aux" library="reverb" uuid="f29a1400-a3bb-11df-8ddc-0002a5d5c51b"/>

audio/aidl/vts/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -121,6 +121,9 @@ cc_test {
		name: "VtsHalEnvironmentalReverbTargetTest",
		defaults: ["VtsHalAudioEffectTargetTestDefaults"],
		srcs: ["VtsHalEnvironmentalReverbTargetTest.cpp"],
		shared_libs: [
		"libaudioutils",
		],
		}

		cc_test {

audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp

+322 −403

File changed.

Preview size limit exceeded, changes collapsed.

confirmationui/aidl/android/hardware/confirmationui/IConfirmationResultCallback.aidl

+10 −11

Original line number	Diff line number	Diff line
		@@ -38,15 +38,15 @@ interface IConfirmationResultCallback {
		* prevented the TUI from being shut down gracefully.
		*
		* @param formattedMessage holds the prompt text and extra data.
		* The message is CBOR (RFC 7049) encoded and has the following format:
		* CBOR_MAP{ "prompt", <promptText>, "extra", <extraData> }
		* The message is a CBOR encoded map (type 5) with the keys
		* "prompt" and "extra". The keys are encoded as CBOR text string
		* (type 3). The value <promptText> is encoded as CBOR text string
		* (type 3), and the value <extraData> is encoded as CBOR byte string
		* (type 2). The map must have exactly one key value pair for each of
		* the keys "prompt" and "extra". Other keys are not allowed.
		* The value of "prompt" is given by the proptText argument to
		* The message is CBOR (RFC 7049) encoded and has the exact format
		* given by the following CDDL:
		*
		* formattedMessage = {
		* "prompt" : tstr,
		* "extra" : bstr,
		* }
		*
		* The value of "prompt" is given by the promptText argument to
		* IConfirmationUI::promptUserConfirmation and must not be modified
		* by the implementation.
		* The value of "extra" is given by the extraData argument to
		@@ -59,8 +59,7 @@ interface IConfirmationResultCallback {
		* the "", concatenated with the formatted message as returned in the
		* formattedMessage argument. The HMAC is keyed with a 256-bit secret
		* which is shared with Keymaster. In test mode the test key MUST be
		* used (see TestModeCommands.aidl and
		* IConfirmationUI::TEST_KEY_BYTE).
		* used (see TestModeCommands.aidl and IConfirmationUI::TEST_KEY_BYTE)
		*/
		void result(in int error, in byte[] formattedMessage, in byte[] confirmationToken);
		}

security/keymint/support/fuzzer/Android.bp

0 → 100644

+69 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at:
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*
		*/

		package {
		// See: http://go/android-license-faq
		// A large-scale-change added 'default_applicable_licenses' to import
		// all of the 'license_kinds' from "hardware_interfaces_license"
		// to get the below license kinds:
		// SPDX-license-identifier-Apache-2.0
		default_applicable_licenses: ["hardware_interfaces_license"],
		default_team: "trendy_team_android_hardware_backed_security",
		}

		cc_defaults {
		name: "keymint_fuzzer_defaults",
		static_libs: [
		"libhidlbase",
		"libkeymint_support",
		],
		shared_libs: [
		"libbase",
		"libcrypto",
		"libutils",
		"libhardware",
		"libbinder_ndk",
		"liblog",
		],
		defaults: [
		"keymint_use_latest_hal_aidl_ndk_shared",
		],
		include_dirs: [
		"hardware/interfaces/security/keymint/support/include",
		"frameworks/native/libs/binder/ndk/include_platform",
		],
		}

		cc_fuzz {
		name: "keymint_attestation_fuzzer",
		srcs: [
		"keymint_attestation_fuzzer.cpp",
		],
		defaults: [
		"keymint_fuzzer_defaults",
		],
		}

		cc_fuzz {
		name: "keymint_authSet_fuzzer",
		srcs: [
		"keymint_authSet_fuzzer.cpp",
		],
		defaults: [
		"keymint_fuzzer_defaults",
		],
		}