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

Commit 99ba5507 authored by Pomai Ahlo's avatar Pomai Ahlo Committed by Android (Google) Code Review
Browse files

Merge changes from topic "isap_hidl2aidl" 

* changes:
  [ISap hidl2aidl] VTS Tests
  [ISap hidl2aidl] Compat Support
  Radio: hidl2aidl for ISap interface
parents dc6c8661 dc1e6193

compatibility_matrices/compatibility_matrix.current.xml

+10 −0
Original line number Diff line number Diff line
@@ -512,6 +512,16 @@ 
            <instance>slot3</instance>

        </interface>

    </hal>

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

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

        <version>1</version>

        <interface>

            <name>ISap</name>

            <instance>slot1</instance>

            <instance>slot2</instance>

            <instance>slot3</instance>

        </interface>

    </hal>

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

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

        <version>2</version>

radio/aidl/Android.bp

+17 −0
Original line number Diff line number Diff line
@@ -152,6 +152,23 @@ aidl_interface { 


}



aidl_interface {

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

    vendor_available: true,

    host_supported: true,

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

    stability: "vintf",

    backend: {

        cpp: {

            enabled: true,

        },

        java: {

            sdk_version: "module_current",

        },

    },



}



aidl_interface {

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

    vendor_available: true,

radio/aidl/aidl_api/android.hardware.radio.sap/current/android/hardware/radio/sap/ISap.aidl

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

 * Copyright (C) 2022 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.sap;

@VintfStability

interface ISap {

  oneway void apduReq(in int serial, in android.hardware.radio.sap.SapApduType type, in byte[] command);

  oneway void connectReq(in int serial, in int maxMsgSizeBytes);

  oneway void disconnectReq(in int serial);

  oneway void powerReq(in int serial, in boolean powerOn);

  oneway void resetSimReq(in int serial);

  oneway void setCallback(in android.hardware.radio.sap.ISapCallback sapCallback);

  oneway void setTransferProtocolReq(in int serial, in android.hardware.radio.sap.SapTransferProtocol transferProtocol);

  oneway void transferAtrReq(in int serial);

  oneway void transferCardReaderStatusReq(in int serial);

}

radio/aidl/aidl_api/android.hardware.radio.sap/current/android/hardware/radio/sap/ISapCallback.aidl

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

 * Copyright (C) 2022 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.sap;

@VintfStability

interface ISapCallback {

  oneway void apduResponse(in int serial, in android.hardware.radio.sap.SapResultCode resultCode, in byte[] apduRsp);

  oneway void connectResponse(in int serial, in android.hardware.radio.sap.SapConnectRsp sapConnectRsp, in int maxMsgSizeBytes);

  oneway void disconnectIndication(in int serial, in android.hardware.radio.sap.SapDisconnectType disconnectType);

  oneway void disconnectResponse(in int serial);

  oneway void errorResponse(in int serial);

  oneway void powerResponse(in int serial, in android.hardware.radio.sap.SapResultCode resultCode);

  oneway void resetSimResponse(in int serial, in android.hardware.radio.sap.SapResultCode resultCode);

  oneway void statusIndication(in int serial, in android.hardware.radio.sap.SapStatus status);

  oneway void transferAtrResponse(in int serial, in android.hardware.radio.sap.SapResultCode resultCode, in byte[] atr);

  oneway void transferCardReaderStatusResponse(in int serial, in android.hardware.radio.sap.SapResultCode resultCode, in int cardReaderStatus);

  oneway void transferProtocolResponse(in int serial, in android.hardware.radio.sap.SapResultCode resultCode);

}

radio/aidl/aidl_api/android.hardware.radio.sap/current/android/hardware/radio/sap/SapApduType.aidl

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

 * Copyright (C) 2022 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.sap;

@Backing(type="int") @VintfStability

enum SapApduType {

  APDU = 0,

  APDU7816 = 1,

}