Merge "Adding IAudioControl#onDevicesToDuckChange" (65d1029e) · Commits · e / os / android_hardware_interfaces

automotive/audiocontrol/aidl/aidl_api/android.hardware.automotive.audiocontrol/current/android/hardware/automotive/audiocontrol/DuckingInfo.aidl

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		///////////////////////////////////////////////////////////////////////////////
		// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
		///////////////////////////////////////////////////////////////////////////////

		// This file is a snapshot of an AIDL interface (or parcelable). Do not try to
		// edit this file. It looks like you are doing that because you have modified
		// an AIDL interface in a backward-incompatible way, e.g., deleting a function
		// from an interface or a field from a parcelable and it broke the build. That
		// breakage is intended.
		//
		// You must not make a backward incompatible changes to the AIDL files 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.automotive.audiocontrol;
		@VintfStability
		parcelable DuckingInfo {
		int zoneId;
		String[] deviceAddressesToDuck;
		String[] deviceAddressesToUnduck;
		String[] usagesHoldingFocus;
		}

automotive/audiocontrol/aidl/aidl_api/android.hardware.automotive.audiocontrol/current/android/hardware/automotive/audiocontrol/IAudioControl.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.hardware.automotive.audiocontrol;
		@VintfStability
		interface IAudioControl {
		oneway void onAudioFocusChange(in String usage, in int zoneId, in android.hardware.automotive.audiocontrol.AudioFocusChange focusChange);
		oneway void onDevicesToDuckChange(in android.hardware.automotive.audiocontrol.DuckingInfo[] duckingInfos);
		oneway void registerFocusListener(in android.hardware.automotive.audiocontrol.IFocusListener listener);
		oneway void setBalanceTowardRight(in float value);
		oneway void setFadeTowardFront(in float value);

automotive/audiocontrol/aidl/android/hardware/automotive/audiocontrol/DuckingInfo.aidl

0 → 100644

+54 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 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 android.hardware.automotive.audiocontrol;

		/**
		* The current ducking information for a single audio zone.
		*
		* <p>This includes devices to duck, as well as unduck based on the contents of a previous
		* {@link DuckingInfo}. Additionally, the current usages holding focus in the specified zone are
		* included, which were used to determine which addresses to duck.
		*/
		@VintfStability
		parcelable DuckingInfo {
		/**
		* ID of the associated audio zone
		*/
		int zoneId;

		/**
		* List of addresses for audio output devices that should be ducked.
		*
		* <p>The provided address strings are defined in audio_policy_configuration.xml.
		*/
		String[] deviceAddressesToDuck;

		/**
		* List of addresses for audio output devices that were previously be ducked and should now be
		* unducked.
		*
		* <p>The provided address strings are defined in audio_policy_configuration.xml.
		*/
		String[] deviceAddressesToUnduck;

		/**
		* List of usages currently holding focus for this audio zone.
		*
		* <p> See {@code audioUsage} in audio_policy_configuration.xsd for the list of allowed values.
		*/
		String[] usagesHoldingFocus;
		}
		No newline at end of file

automotive/audiocontrol/aidl/android/hardware/automotive/audiocontrol/IAudioControl.aidl

+12 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.hardware.automotive.audiocontrol;

		import android.hardware.automotive.audiocontrol.AudioFocusChange;
		import android.hardware.automotive.audiocontrol.DuckingInfo;
		import android.hardware.automotive.audiocontrol.IFocusListener;

		/**
		@@ -41,6 +42,17 @@ interface IAudioControl {
		*/
		oneway void onAudioFocusChange(in String usage, in int zoneId, in AudioFocusChange focusChange);

		/**
		* Notifies HAL of changes in output devices that the HAL should apply ducking to.
		*
		* This will be called in response to changes in audio focus, and will include a
		* {@link DuckingInfo} object per audio zone that experienced a change in audo focus.
		*
		* @param duckingInfos an array of {@link DuckingInfo} objects for the audio zones where audio
		* focus has changed.
		*/
		oneway void onDevicesToDuckChange(in DuckingInfo[] duckingInfos);

		/**
		* Registers focus listener to be used by HAL for requesting and abandoning audio focus.
		*

automotive/audiocontrol/aidl/default/AudioControl.cpp

+22 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		#include "AudioControl.h"

		#include <aidl/android/hardware/automotive/audiocontrol/AudioFocusChange.h>
		#include <aidl/android/hardware/automotive/audiocontrol/DuckingInfo.h>
		#include <aidl/android/hardware/automotive/audiocontrol/IFocusListener.h>

		#include <android-base/logging.h>
		@@ -102,6 +103,27 @@ ndk::ScopedAStatus AudioControl::onAudioFocusChange(const string& in_usage, int3
		return ndk::ScopedAStatus::ok();
		}

		ndk::ScopedAStatus AudioControl::onDevicesToDuckChange(
		const std::vector<DuckingInfo>& in_duckingInfos) {
		LOG(INFO) << "AudioControl::onDevicesToDuckChange";
		for (const DuckingInfo& duckingInfo : in_duckingInfos) {
		LOG(INFO) << "zone: " << duckingInfo.zoneId;
		LOG(INFO) << "Devices to duck:";
		for (auto& addressToDuck : duckingInfo.deviceAddressesToDuck) {
		LOG(INFO) << addressToDuck;
		}
		LOG(INFO) << "Devices to unduck:";
		for (auto& addressToUnduck : duckingInfo.deviceAddressesToUnduck) {
		LOG(INFO) << addressToUnduck;
		}
		LOG(INFO) << "Usages holding focus:";
		for (auto& usage : duckingInfo.usagesHoldingFocus) {
		LOG(INFO) << usage;
		}
		}
		return ndk::ScopedAStatus::ok();
		}

		binder_status_t AudioControl::dump(int fd, const char** args, uint32_t numArgs) {
		if (numArgs == 0) {
		return dumpsys(fd);