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

Commit bea3243b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Audio AIDL : Rename AutomaticGainControl to AutomaticGainControlV2" am: b240b7ca 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2412034



Change-Id: Ibf5b8b668b0fffebc330c007f78a870df010db61
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d3ccf778 b240b7ca

audio/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -225,8 +225,8 @@ aidl_interface { 
    ],

    srcs: [

        "android/hardware/audio/effect/AcousticEchoCanceler.aidl",

        "android/hardware/audio/effect/AutomaticGainControl.aidl",

        "android/hardware/audio/effect/AutomaticGainControlV1.aidl",

        "android/hardware/audio/effect/AutomaticGainControlV2.aidl",

        "android/hardware/audio/effect/BassBoost.aidl",

        "android/hardware/audio/effect/Capability.aidl",

        "android/hardware/audio/effect/CommandId.aidl",

audio/aidl/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
      "name": "VtsHalAECTargetTest"

    },

    {

      "name": "VtsHalAGCTargetTest"

      "name": "VtsHalAGC2TargetTest"

    },

    {

      "name": "VtsHalNSTargetTest"

audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/AutomaticGainControl.aidl→audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/AutomaticGainControlV2.aidl

+3 −3
Original line number Diff line number Diff line
@@ -33,15 +33,15 @@ 


package android.hardware.audio.effect;

@VintfStability

union AutomaticGainControl {

union AutomaticGainControlV2 {

  android.hardware.audio.effect.VendorExtension vendor;

  int fixedDigitalGainMb;

  android.hardware.audio.effect.AutomaticGainControl.LevelEstimator levelEstimator;

  android.hardware.audio.effect.AutomaticGainControlV2.LevelEstimator levelEstimator;

  int saturationMarginMb;

  @VintfStability

  union Id {

    int vendorExtensionTag;

    android.hardware.audio.effect.AutomaticGainControl.Tag commonTag;

    android.hardware.audio.effect.AutomaticGainControlV2.Tag commonTag;

  }

  @Backing(type="int") @VintfStability

  enum LevelEstimator {

audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Descriptor.aidl

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ parcelable Descriptor { 
  const String EFFECT_TYPE_UUID_EQUALIZER = "0bed4300-ddd6-11db-8f34-0002a5d5c51b";

  const String EFFECT_TYPE_UUID_BASS_BOOST = "0634f220-ddd4-11db-a0fc-0002a5d5c51b";

  const String EFFECT_TYPE_UUID_VIRTUALIZER = "37cc2c00-dddd-11db-8577-0002a5d5c51b";

  const String EFFECT_TYPE_UUID_AGC = "0a8abfe0-654c-11e0-ba26-0002a5d5c51b";

  const String EFFECT_TYPE_UUID_AGC2 = "ae3c653b-be18-4ab8-8938-418f0a7f06ac";

  const String EFFECT_TYPE_UUID_AEC = "7b491460-8d4d-11e0-bd61-0002a5d5c51b";

  const String EFFECT_TYPE_UUID_NS = "58b4b260-8e06-11e0-aa8e-0002a5d5c51b";

  const String EFFECT_TYPE_UUID_LOUDNESS_ENHANCER = "fe3199be-aed0-413f-87bb-11260eb63cf1";

audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Parameter.aidl

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ union Parameter { 
  union Id {

    int vendorEffectTag;

    android.hardware.audio.effect.AcousticEchoCanceler.Id acousticEchoCancelerTag;

    android.hardware.audio.effect.AutomaticGainControl.Id automaticGainControlTag;

    android.hardware.audio.effect.AutomaticGainControlV2.Id automaticGainControlV2Tag;

    android.hardware.audio.effect.BassBoost.Id bassBoostTag;

    android.hardware.audio.effect.Downmix.Id downmixTag;

    android.hardware.audio.effect.DynamicsProcessing.Id dynamicsProcessingTag;
@@ -75,7 +75,7 @@ union Parameter { 
  union Specific {

    android.hardware.audio.effect.VendorExtension vendorEffect;

    android.hardware.audio.effect.AcousticEchoCanceler acousticEchoCanceler;

    android.hardware.audio.effect.AutomaticGainControl automaticGainControl;

    android.hardware.audio.effect.AutomaticGainControlV2 automaticGainControlV2;

    android.hardware.audio.effect.BassBoost bassBoost;

    android.hardware.audio.effect.Downmix downmix;

    android.hardware.audio.effect.DynamicsProcessing dynamicsProcessing;