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

Commit 480da160 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "V1 is the latest version of android.media.audio.common.types" into tm-dev am: 8530ee45 

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



Change-Id: I6ffcabe53ced9a162432c8d6df5cc0df3b1f5186
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 05f861b8 8530ee45

media/libaaudio/src/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ aidl_interface { 
        "binding/aidl/aaudio/IAAudioService.aidl",

    ],

    imports: [

        "android.media.audio.common.types",

        "android.media.audio.common.types-V1",

        "audioclient-types-aidl",

        "shared-file-region-aidl",

        "framework-permission-aidl",

media/libaudioclient/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ aidl_interface { 
        "aidl/android/media/TrackSecondaryOutputInfo.aidl",

    ],

    imports: [

        "android.media.audio.common.types",

        "android.media.audio.common.types-V1",

        "framework-permission-aidl",

    ],

    backend: {
@@ -389,7 +389,7 @@ aidl_interface { 
        "aidl/android/media/SpatializerHeadTrackingMode.aidl",

    ],

    imports: [

        "android.media.audio.common.types",

        "android.media.audio.common.types-V1",

        "audioclient-types-aidl",

    ],

    backend: {
@@ -432,7 +432,7 @@ aidl_interface { 
        "aidl/android/media/IAudioTrackCallback.aidl",

    ],

    imports: [

        "android.media.audio.common.types",

        "android.media.audio.common.types-V1",

        "audioclient-types-aidl",

        "av-types-aidl",

        "effect-aidl",
@@ -469,7 +469,7 @@ aidl_interface { 
        "aidl/android/media/IAudioPolicyServiceClient.aidl",

    ],

    imports: [

        "android.media.audio.common.types",

        "android.media.audio.common.types-V1",

        "audioclient-types-aidl",

        "audiopolicy-types-aidl",

        "capture_state_listener-aidl",