Snap for 9442605 from 82c20374e7bd7d5079d17c019ec1671ad9b22898 to udc-release (0f243a17) · Commits · e / os / android_hardware_interfaces

audio/aidl/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -114,7 +114,6 @@ aidl_interface {
		"android/hardware/audio/core/AudioRoute.aidl",
		"android/hardware/audio/core/IConfig.aidl",
		"android/hardware/audio/core/IModule.aidl",
		"android/hardware/audio/core/ISoundDose.aidl",
		"android/hardware/audio/core/IStreamCallback.aidl",
		"android/hardware/audio/core/IStreamCommon.aidl",
		"android/hardware/audio/core/IStreamIn.aidl",
		@@ -133,6 +132,7 @@ aidl_interface {
		"android.hardware.common-V2",
		"android.hardware.common.fmq-V1",
		"android.hardware.audio.common-V1",
		"android.hardware.audio.core.sounddose-V1",
		"android.hardware.audio.effect-V1",
		"android.media.audio.common.types-V2",
		],
		@@ -178,7 +178,7 @@ aidl_interface {
		"android.hardware.audio_defaults",
		],
		srcs: [
		"android/hardware/audio/core/ISoundDose.aidl",
		"android/hardware/audio/core/sounddose/ISoundDose.aidl",
		],
		imports: [
		"android.media.audio.common.types-V2",

audio/aidl/TEST_MAPPING

+3 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,9 @@
		{
		"name": "VtsHalDownmixTargetTest"
		},
		{
		"name": "VtsHalEnvironmentalReverbTargetTest"
		},
		{
		"name": "VtsHalEqualizerTargetTest"
		},

audio/aidl/aidl_api/android.hardware.audio.core.sounddose/current/android/hardware/audio/core/ISoundDose.aidl→audio/aidl/aidl_api/android.hardware.audio.core.sounddose/current/android/hardware/audio/core/sounddose/ISoundDose.aidl

+3 −3

Original line number	Diff line number	Diff line
		@@ -31,18 +31,18 @@
		// 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.audio.core;
		package android.hardware.audio.core.sounddose;
		@VintfStability
		interface ISoundDose {
		void setOutputRs2(float rs2ValueDbA);
		float getOutputRs2();
		void registerSoundDoseCallback(in android.hardware.audio.core.ISoundDose.IHalSoundDoseCallback callback);
		void registerSoundDoseCallback(in android.hardware.audio.core.sounddose.ISoundDose.IHalSoundDoseCallback callback);
		const int DEFAULT_MAX_RS2 = 100;
		const int MIN_RS2 = 80;
		@VintfStability
		interface IHalSoundDoseCallback {
		oneway void onMomentaryExposureWarning(float currentDbA, in android.media.audio.common.AudioDevice audioDevice);
		oneway void onNewMelValues(in android.hardware.audio.core.ISoundDose.IHalSoundDoseCallback.MelRecord melRecord, in android.media.audio.common.AudioDevice audioDevice);
		oneway void onNewMelValues(in android.hardware.audio.core.sounddose.ISoundDose.IHalSoundDoseCallback.MelRecord melRecord, in android.media.audio.common.AudioDevice audioDevice);
		@VintfStability
		parcelable MelRecord {
		float[] melValues;

audio/aidl/aidl_api/android.hardware.audio.core/current/android/hardware/audio/core/IModule.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ interface IModule {
		void updateAudioMode(android.hardware.audio.core.AudioMode mode);
		void updateScreenRotation(android.hardware.audio.core.IModule.ScreenRotation rotation);
		void updateScreenState(boolean isTurnedOn);
		@nullable android.hardware.audio.core.ISoundDose getSoundDose();
		@nullable android.hardware.audio.core.sounddose.ISoundDose getSoundDose();
		int generateHwAvSyncId();
		android.hardware.audio.core.VendorParameter[] getVendorParameters(in @utf8InCpp String[] ids);
		void setVendorParameters(in android.hardware.audio.core.VendorParameter[] parameters, boolean async);

audio/aidl/aidl_api/android.hardware.audio.core/current/android/hardware/audio/core/ISoundDose.aidl

deleted100644 → 0

+0 −52

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.audio.core;
		@VintfStability
		interface ISoundDose {
		void setOutputRs2(float rs2ValueDbA);
		float getOutputRs2();
		void registerSoundDoseCallback(in android.hardware.audio.core.ISoundDose.IHalSoundDoseCallback callback);
		const int DEFAULT_MAX_RS2 = 100;
		const int MIN_RS2 = 80;
		@VintfStability
		interface IHalSoundDoseCallback {
		oneway void onMomentaryExposureWarning(float currentDbA, in android.media.audio.common.AudioDevice audioDevice);
		oneway void onNewMelValues(in android.hardware.audio.core.ISoundDose.IHalSoundDoseCallback.MelRecord melRecord, in android.media.audio.common.AudioDevice audioDevice);
		@VintfStability
		parcelable MelRecord {
		float[] melValues;
		long timestamp;
		}
		}
		}