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

Commit b1cb0b6a authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

Make IHalAdapterVendorExtension stable and frozen 

This allows to put its interface fragment into
framework VINTF and allows use AServiceManager_isDeclared
for detecting whether it is provided by SoC vendor.

Bug: 321651892
Bug: 323106963
Test: adb shell logcat | grep IHalAdapterVendorExtension
Change-Id: Ifa724eabf488d3f28e94074c588bf43d3bfb251c
Merged-In: Ifa724eabf488d3f28e94074c588bf43d3bfb251c
parent 462ad0cd

Android.bp

+8 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ cc_library_headers { 


aidl_interface {

    name: "av-audio-types-aidl",

    unstable: true,

    host_supported: true,

    vendor_available: true,

    double_loadable: true,
@@ -125,4 +124,12 @@ aidl_interface { 
            sdk_version: "module_current",

        },

    },

    versions_with_info: [

        {

            version: "1",

            imports: ["android.hardware.audio.core-V2"],

        },

    ],

    frozen: true,



}

aidl_api/av-audio-types-aidl/1/.hash

0 → 100644
+1 −0
Original line number Diff line number Diff line 
ef1bc5ed9db445fbfc116cdec6e6ad081458ee40

aidl_api/av-audio-types-aidl/1/android/media/audio/IHalAdapterVendorExtension.aidl

0 → 100644
+46 −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.media.audio;

/* @hide */

interface IHalAdapterVendorExtension {

  @utf8InCpp String[] parseVendorParameterIds(android.media.audio.IHalAdapterVendorExtension.ParameterScope scope, in @utf8InCpp String rawKeys);

  void parseVendorParameters(android.media.audio.IHalAdapterVendorExtension.ParameterScope scope, in @utf8InCpp String rawKeysAndValues, out android.hardware.audio.core.VendorParameter[] syncParameters, out android.hardware.audio.core.VendorParameter[] asyncParameters);

  android.hardware.audio.core.VendorParameter[] parseBluetoothA2dpReconfigureOffload(in @utf8InCpp String rawValue);

  android.hardware.audio.core.VendorParameter[] parseBluetoothLeReconfigureOffload(in @utf8InCpp String rawValue);

  @utf8InCpp String processVendorParameters(android.media.audio.IHalAdapterVendorExtension.ParameterScope scope, in android.hardware.audio.core.VendorParameter[] parameters);

  enum ParameterScope {

    MODULE = 0,

    STREAM = 1,

  }

}

aidl_api/av-audio-types-aidl/current/android/media/audio/IHalAdapterVendorExtension.aidl

0 → 100644
+46 −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.media.audio;

/* @hide */

interface IHalAdapterVendorExtension {

  @utf8InCpp String[] parseVendorParameterIds(android.media.audio.IHalAdapterVendorExtension.ParameterScope scope, in @utf8InCpp String rawKeys);

  void parseVendorParameters(android.media.audio.IHalAdapterVendorExtension.ParameterScope scope, in @utf8InCpp String rawKeysAndValues, out android.hardware.audio.core.VendorParameter[] syncParameters, out android.hardware.audio.core.VendorParameter[] asyncParameters);

  android.hardware.audio.core.VendorParameter[] parseBluetoothA2dpReconfigureOffload(in @utf8InCpp String rawValue);

  android.hardware.audio.core.VendorParameter[] parseBluetoothLeReconfigureOffload(in @utf8InCpp String rawValue);

  @utf8InCpp String processVendorParameters(android.media.audio.IHalAdapterVendorExtension.ParameterScope scope, in android.hardware.audio.core.VendorParameter[] parameters);

  enum ParameterScope {

    MODULE = 0,

    STREAM = 1,

  }

}

media/libaudiohal/impl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ cc_defaults { 
    shared_libs: [

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

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

        "av-audio-types-aidl-ndk",

        "av-audio-types-aidl-V1-ndk",

        "libaudio_aidl_conversion_common_cpp",

        "libaudio_aidl_conversion_common_ndk",

        "libaudio_aidl_conversion_common_ndk_cpp",