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

Commit 5dbc8575 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[IRadioConfig] Generating AIDL definitions" into stage-aosp-master am:... 

Merge "[IRadioConfig] Generating AIDL definitions" into stage-aosp-master am: b703745c am: 3834b1c2

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

Change-Id: Idfdafca93f8fc2fda2608dc239f3db626cde5c50
parents d33e4bc9 3834b1c2

compatibility_matrices/compatibility_matrix.current.xml

+8 −0
Original line number Diff line number Diff line
@@ -471,6 +471,14 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="aidl" optional="true">

        <name>android.hardware.radio.config</name>

        <version>1</version>

        <interface>

            <name>IRadioConfig</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.radio.config</name>

        <version>1.3</version>

radio/config/aidl/Android.bp

0 → 100644
+55 −0
Original line number Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "hardware_interfaces_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["hardware_interfaces_license"],

}



aidl_interface {

    name: "android.hardware.radio.config",

    vendor_available: true,

    srcs: ["android/hardware/radio/config/*.aidl"],

    stability: "vintf",

    imports: ["android.hardware.radio"],

    backend: {

        cpp: {

            enabled: false,

        },

        java: {

            sdk_version: "module_current",

        },

        ndk: {

            vndk: {

                enabled: true,

            },

        },

    },

}



cc_library {

    name: "android.hardware.radio.config-translate-ndk",

    vendor_available: true,

    shared_libs: [

        "libbinder_ndk",

        "libhidlbase",

        "android.hardware.radio.config-V1-ndk_platform",

        "android.hardware.radio.config@1.0",

        "android.hardware.radio.config@1.1",

        "android.hardware.radio.config@1.2",

        "android.hardware.radio.config@1.3",

    ],

}



java_library {

    name: "android.hardware.radio.config-translate-java",

    libs: [

        "android.hardware.radio.config-V1-java",

        "android.hardware.radio.config-V1.0-java",

        "android.hardware.radio.config-V1.1-java",

        "android.hardware.radio.config-V1.2-java",

        "android.hardware.radio.config-V1.3-java",

    ],

    sdk_version: "module_current",

}

radio/config/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfig.aidl

0 → 100644
+53 −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 interface is used by telephony and telecom to talk to cellular radio for the purpose of

 * radio configuration, and it is not associated with any specific modem or slot.

 * All the functions have minimum one parameter:

 * serial: which corresponds to serial no. of request. Serial numbers must only be memorized for the

 * duration of a method call. If clients provide colliding serials (including passing the same

 * serial to different methods), multiple responses (one for each method call) must still be served.

 */

///////////////////////////////////////////////////////////////////////////////

// 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.radio.config;

@VintfStability

interface IRadioConfig {

  oneway void getHalDeviceCapabilities(in int serial);

  oneway void getNumOfLiveModems(in int serial);

  oneway void getPhoneCapability(in int serial);

  oneway void getSimSlotsStatus(in int serial);

  oneway void setNumOfLiveModems(in int serial, in byte numOfLiveModems);

  oneway void setPreferredDataModem(in int serial, in byte modemId);

  oneway void setResponseFunctions(in android.hardware.radio.config.IRadioConfigResponse radioConfigResponse, in android.hardware.radio.config.IRadioConfigIndication radioConfigIndication);

  oneway void setSimSlotsMapping(in int serial, in int[] slotMap);

}

radio/config/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfigIndication.aidl

0 → 100644
+38 −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.radio.config;

@VintfStability

interface IRadioConfigIndication {

  oneway void simSlotsStatusChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.config.SimSlotStatus[] slotStatus);

}

radio/config/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfigResponse.aidl

0 → 100644
+44 −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.radio.config;

@VintfStability

interface IRadioConfigResponse {

  oneway void getHalDeviceCapabilitiesResponse(in android.hardware.radio.RadioResponseInfo info, in boolean modemReducedFeatureSet1);

  oneway void getNumOfLiveModemsResponse(in android.hardware.radio.RadioResponseInfo info, in byte numOfLiveModems);

  oneway void getPhoneCapabilityResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.config.PhoneCapability phoneCapability);

  oneway void getSimSlotsStatusResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.config.SimSlotStatus[] slotStatus);

  oneway void setNumOfLiveModemsResponse(in android.hardware.radio.RadioResponseInfo info);

  oneway void setPreferredDataModemResponse(in android.hardware.radio.RadioResponseInfo info);

  oneway void setSimSlotsMappingResponse(in android.hardware.radio.RadioResponseInfo info);

}