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

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

Merge "Freeze Audio AIDL interfaces" am: 8182edb4 am: 4f34d7c3 

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



Change-Id: Ide8a47de35efb94470142bb302d14727266303d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9329fd19 4f34d7c3

audio/aidl/Android.bp

+38 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ aidl_interface { 
        "android/hardware/audio/common/SinkMetadata.aidl",

        "android/hardware/audio/common/SourceMetadata.aidl",

    ],

    frozen: false,

    frozen: true,

    imports: [

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

    ],
@@ -71,6 +71,11 @@ aidl_interface { 
            version: "1",

            imports: ["android.media.audio.common.types-V2"],

        },

        {

            version: "2",

            imports: ["android.media.audio.common.types-V2"],

        },



        // IMPORTANT: Update latest_android_hardware_audio_common every time you

        // add the latest frozen version to versions_with_info

    ],
@@ -147,9 +152,22 @@ aidl_interface { 
        },

    },

    versions_with_info: [

        {

            version: "1",

            imports: [

                "android.hardware.common-V2",

                "android.hardware.common.fmq-V1",

                "android.hardware.audio.common-V2",

                "android.hardware.audio.core.sounddose-V1",

                "android.hardware.audio.effect-V1",

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

            ],

        },



        // IMPORTANT: Update latest_android_hardware_audio_core every time you

        // add the latest frozen version to versions_with_info

    ],

    frozen: true,

}



// Note: This should always be one version ahead of the last frozen version
@@ -194,9 +212,15 @@ aidl_interface { 
        },

    },

    versions_with_info: [

        {

            version: "1",

            imports: ["android.media.audio.common.types-V2"],

        },



        // IMPORTANT: Update latest_android_hardware_audio_core_sounddose every time you

        // add the latest frozen version to versions_with_info

    ],

    frozen: true,

}



// Note: This should always be one version ahead of the last frozen version
@@ -268,6 +292,19 @@ aidl_interface { 
            sdk_version: "module_current",

        },

    },

    frozen: true,

    versions_with_info: [

        {

            version: "1",

            imports: [

                "android.hardware.common-V2",

                "android.hardware.common.fmq-V1",

                "android.hardware.audio.common-V2",

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

            ],

        },

    ],



}



latest_android_hardware_audio_effect = "android.hardware.audio.effect-V1"

audio/aidl/aidl_api/android.hardware.audio.common/2/.hash

0 → 100644
+1 −0
Original line number Diff line number Diff line 
6780ccb29120b4c7d3ed60f55a23c13b0431f3a4

audio/aidl/aidl_api/android.hardware.audio.common/2/android/hardware/audio/common/AudioOffloadMetadata.aidl

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.audio.common;

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

parcelable AudioOffloadMetadata {

  int sampleRate;

  android.media.audio.common.AudioChannelLayout channelMask;

  int averageBitRatePerSecond;

  int delayFrames;

  int paddingFrames;

}

audio/aidl/aidl_api/android.hardware.audio.common/2/android/hardware/audio/common/PlaybackTrackMetadata.aidl

0 → 100644
+43 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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.audio.common;

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

parcelable PlaybackTrackMetadata {

  android.media.audio.common.AudioUsage usage = android.media.audio.common.AudioUsage.INVALID;

  android.media.audio.common.AudioContentType contentType = android.media.audio.common.AudioContentType.UNKNOWN;

  float gain;

  android.media.audio.common.AudioChannelLayout channelMask;

  @nullable android.media.audio.common.AudioDevice sourceDevice;

  @utf8InCpp String[] tags;

}

audio/aidl/aidl_api/android.hardware.audio.common/2/android/hardware/audio/common/RecordTrackMetadata.aidl

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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.audio.common;

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

parcelable RecordTrackMetadata {

  android.media.audio.common.AudioSource source = android.media.audio.common.AudioSource.SYS_RESERVED_INVALID;

  float gain;

  @nullable android.media.audio.common.AudioDevice destinationDevice;

  android.media.audio.common.AudioChannelLayout channelMask;

  @utf8InCpp String[] tags;

}