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

Commit d45fd704 authored by Sandeep Jawalkar's avatar Sandeep Jawalkar Committed by Gerrit Code Review
Browse files

Merge "[Android T][MEP]: HAL changes for MEP feature"

parents 9c1c9c65 e4bee9de

radio/aidl/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -137,7 +137,10 @@ aidl_interface { 
    vendor_available: true,

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

    stability: "vintf",

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

    imports: [

        "android.hardware.radio",

        "android.hardware.radio.config",

    ],

    backend: {

        cpp: {

            enabled: false,

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

+1 −1
Original line number Diff line number Diff line
@@ -49,5 +49,5 @@ interface IRadioConfig { 
  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);

  oneway void setSimSlotsMapping(in int serial, in android.hardware.radio.config.SlotPortMapping[] slotMap);

}

radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/SimPortInfo.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.radio.config;

@VintfStability

parcelable SimPortInfo {

  String iccId;

  int logicalSlotId;

  int portState;

  const int PORT_STATE_INACTIVE = 0;

  const int PORT_STATE_ACTIVE = 1;

}

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

+1 −3
Original line number Diff line number Diff line
@@ -36,9 +36,7 @@ package android.hardware.radio.config; 
parcelable SimSlotStatus {

  boolean cardActive;

  int cardState;

  int slotState;

  String atr;

  int logicalSlotId;

  String iccid;

  String eid;

  android.hardware.radio.config.SimPortInfo[] portInfo;

}

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

0 → 100644
+39 −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

parcelable SlotPortMapping {

  int physicalSlotId;

  int portId;

}