Merge changes from topic "fixAudioAidlVersions-tm-dev-plus-aosp" into tm-dev-plus-aosp am: 71052c75b4 am: a4735bf97a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19875061

Change-Id: Id53b5cacec09793ba07687205a0980d2ce54d400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lorena Torres-Huerta
2022-09-07 18:38:06 +00:00
committed by Automerger Merge Worker

View File

@@ -35,8 +35,8 @@ aidl_interface {
"aidl/android/media/soundtrigger_middleware/SoundTriggerModuleDescriptor.aidl",
],
imports: [
"android.media.audio.common.types",
"android.media.soundtrigger.types",
"android.media.audio.common.types-V2",
"android.media.soundtrigger.types-V1",
"media_permission-aidl",
],
}
@@ -232,12 +232,12 @@ aidl_interface {
},
},
imports: [
"android.media.audio.common.types",
"android.media.audio.common.types-V2",
],
versions_with_info: [
{
version: "1",
imports: ["android.media.audio.common.types-V1"],
imports: ["android.media.audio.common.types-V2"],
},
],