Snap for 11666018 from a8c237c76d17f7502bfa91c24aa81e01e9633d09 to 24Q3-release (95dac4e4) · Commits · e / os / android_hardware_interfaces

audio/aidl/vts/VtsHalVolumeTargetTest.cpp

+7 −1

Original line number	Diff line number	Diff line
		@@ -140,7 +140,9 @@ using VolumeDataTestParam = std::pair<std::shared_ptr<IFactory>, Descriptor>;
		class VolumeDataTest : public ::testing::TestWithParam<VolumeDataTestParam>,
		public VolumeControlHelper {
		public:
		VolumeDataTest() {
		VolumeDataTest()
		: kVsrApiLevel(
		android::base::GetIntProperty("ro.vendor.api_level", __ANDROID_API_FUTURE__)) {
		std::tie(mFactory, mDescriptor) = GetParam();
		mInput.resize(kBufferSize);
		mInputMag.resize(mTestFrequencies.size());
		@@ -165,13 +167,17 @@ class VolumeDataTest : public ::testing::TestWithParam<VolumeDataTestParam>,

		void SetUp() override {
		SKIP_TEST_IF_DATA_UNSUPPORTED(mDescriptor.common.flags);
		// Skips test fixture if api_level <= 34 (__ANDROID_API_U__).
		if (kVsrApiLevel <= __ANDROID_API_U__) GTEST_SKIP();
		ASSERT_NO_FATAL_FAILURE(SetUpVolumeControl());
		}
		void TearDown() override {
		SKIP_TEST_IF_DATA_UNSUPPORTED(mDescriptor.common.flags);
		if (kVsrApiLevel <= __ANDROID_API_U__) GTEST_SKIP();
		TearDownVolumeControl();
		}

		const int kVsrApiLevel;
		static constexpr int kMaxAudioSample = 1;
		static constexpr int kTransitionDuration = 300;
		static constexpr int kNPointFFT = 32768;

nfc/OWNERS

+1 −5

Original line number	Diff line number	Diff line
		# Bug component: 48448
		alisher@google.com
		georgekgchang@google.com
		jackcwyu@google.com


		include platform/packages/apps/Nfc:/OWNERS
		No newline at end of file

staging/security/OWNERS

0 → 100644

+8 −0

Original line number	Diff line number	Diff line
		armellel@google.com
		arve@android.com
		swillden@google.com
		paulcrowley@google.com
		hasinitg@google.com
		cukie@google.com
		westoncarvalho@google.com
		oarbildo@google.com

staging/security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see/current/android/hardware/security/see/hwcrypto/OperationParameters.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,4 +34,5 @@
		package android.hardware.security.see.hwcrypto;
		union OperationParameters {
		android.hardware.security.see.hwcrypto.types.SymmetricAuthOperationParameters symmetricAuthCrypto;
		android.hardware.security.see.hwcrypto.types.SymmetricOperationParameters symmetricCrypto;
		}

staging/security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see/current/android/hardware/security/see/hwcrypto/types/AesCipherMode.aidl

0 → 100644

+38 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 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.
		*/
		///////////////////////////////////////////////////////////////////////////////
		// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
		///////////////////////////////////////////////////////////////////////////////

		// This file is a snapshot of an AIDL file. Do not edit it manually. There are
		// two cases:
		// 1). this is a frozen version file - do not edit this in any case.
		// 2). this is a 'current' file. If you make a backwards compatible change to
		// the interface (from the latest frozen version), the build system will
		// prompt you to update this file with `m <name>-update-api`.
		//
		// You must not make a backward incompatible change to any AIDL file built
		// with the aidl_interface module type with versions property set. The module
		// type is used to build AIDL files in a way that they can be used across
		// independently updatable components of the system. If a device is shipped
		// with such a backward incompatible change, it has a high risk of breaking
		// later when a module using the interface is updated, e.g., Mainline modules.

		package android.hardware.security.see.hwcrypto.types;
		union AesCipherMode {
		android.hardware.security.see.hwcrypto.types.CipherModeParameters cbc;
		android.hardware.security.see.hwcrypto.types.CipherModeParameters ctr;
		}