Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2744dea3 authored by Oscar Azucena's avatar Oscar Azucena
Browse files

Add audio configurations API to audio control HAL 

The API will be used to obtain the car audio configuration:
- Audio device configurations
- Audio mirroring devices
- Audio zone information
- - Audio zone fade configuration
- - Audio zone configurations
- - Input audio devices
- - Audio zone info

Bug: 359686069
Test: m -j, presubmit
Flag: EXEMPT HAL interface
Change-Id: I32cd7fc351c58e7816a9187d70e5e9c790163dcc
parent 4a14b60e

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

0 → 100644
+41 −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.

 */

///////////////////////////////////////////////////////////////////////////////

// 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.automotive.audiocontrol;

@JavaDerive(equals=true, toString=true) @VintfStability

parcelable AudioDeviceConfiguration {

  android.hardware.automotive.audiocontrol.RoutingDeviceConfiguration routingConfig;

  boolean useCoreAudioVolume;

  boolean useHalDuckingSignals;

  boolean useCarVolumeGroupMuting;

}

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

0 → 100644
+50 −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.

 */

///////////////////////////////////////////////////////////////////////////////

// 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.automotive.audiocontrol;

@JavaDerive(equals=true, toString=true) @VintfStability

parcelable AudioFadeConfiguration {

  String name;

  android.hardware.automotive.audiocontrol.FadeState fadeState;

  long fadeInDurationMs = DEFAULT_FADE_IN_DURATION_MS /* 1000 */;

  long fadeOutDurationMs = DEFAULT_FADE_OUT_DURATION_MS /* 2000 */;

  long fadeInDelayedForOffendersMs = DEFAULT_DELAY_FADE_IN_OFFENDERS_MS /* 2000 */;

  android.media.audio.common.AudioUsage[] fadeableUsages;

  @nullable android.media.audio.common.AudioContentType[] unfadeableContentTypes;

  List<android.media.audio.common.AudioAttributes> unfadableAudioAttributes;

  List<android.hardware.automotive.audiocontrol.FadeConfiguration> fadeOutConfigurations;

  List<android.hardware.automotive.audiocontrol.FadeConfiguration> fadeInConfigurations;

  const long DEFAULT_FADE_IN_DURATION_MS = 1000;

  const long DEFAULT_FADE_OUT_DURATION_MS = 2000;

  const long DEFAULT_DELAY_FADE_IN_OFFENDERS_MS = 2000;

}

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

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ enum AudioFocusChange { 
  GAIN_TRANSIENT = 2,

  GAIN_TRANSIENT_MAY_DUCK = 3,

  GAIN_TRANSIENT_EXCLUSIVE = 4,

  LOSS = -1,

  LOSS_TRANSIENT = -2,

  LOSS_TRANSIENT_CAN_DUCK = -3,

  LOSS = ((-1) * GAIN) /* -1 */,

  LOSS_TRANSIENT = ((-1) * GAIN_TRANSIENT) /* -2 */,

  LOSS_TRANSIENT_CAN_DUCK = ((-1) * GAIN_TRANSIENT_MAY_DUCK) /* -3 */,

}

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

0 → 100644
+45 −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.

 */

///////////////////////////////////////////////////////////////////////////////

// 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.automotive.audiocontrol;

@JavaDerive(equals=true, toString=true) @VintfStability

parcelable AudioZone {

  String name;

  int id;

  int occupantZoneId = UNASSIGNED_OCCUPANT /* -1 */;

  android.hardware.automotive.audiocontrol.AudioZoneContext audioZoneContext;

  List<android.hardware.automotive.audiocontrol.AudioZoneConfig> audioZoneConfigs;

  List<android.media.audio.common.AudioPort> inputAudioDevices;

  const int PRIMARY_AUDIO_ZONE = 0;

  const int UNASSIGNED_OCCUPANT = (-1) /* -1 */;

}

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

0 → 100644
+41 −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.

 */

///////////////////////////////////////////////////////////////////////////////

// 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.automotive.audiocontrol;

@JavaDerive(equals=true, toString=true) @VintfStability

parcelable AudioZoneConfig {

  String name;

  boolean isDefault;

  List<android.hardware.automotive.audiocontrol.VolumeGroupConfig> volumeGroups;

  @nullable android.hardware.automotive.audiocontrol.AudioZoneFadeConfiguration fadeConfiguration;

}