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

Commit 800c7ec5 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "secure-element to AIDL" am: 40e84d92 

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



Change-Id: Icc9a3f6cb9b0e4a98d38d72dce60a147be5516db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aaf2c58c 40e84d92

compatibility_matrices/compatibility_matrix.current.xml

+9 −0
Original line number Original line Diff line number Diff line
@@ -608,6 +608,15 @@ 
            <regex-instance>SIM[1-9][0-9]*</regex-instance>

            <regex-instance>SIM[1-9][0-9]*</regex-instance>

        </interface>

        </interface>

    </hal>

    </hal>

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

        <name>android.hardware.secure_element</name>

        <version>1</version>

        <interface>

            <name>ISecureElement</name>

            <regex-instance>eSE[1-9][0-9]*</regex-instance>

            <regex-instance>SIM[1-9][0-9]*</regex-instance>

        </interface>

    </hal>

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

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

        <name>android.hardware.security.secureclock</name>

        <name>android.hardware.security.secureclock</name>

        <version>1</version>

        <version>1</version>

secure_element/aidl/Android.bp

0 → 100644
+35 −0
Original line number Original line Diff line number Diff line 
aidl_interface {

    name: "android.hardware.secure_element",

    vendor_available: true,

    host_supported: true,

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

    stability: "vintf",

    backend: {

        cpp: {

            enabled: false,

        },

        java: {

            sdk_version: "system_current",

        },

    },

}



cc_test {

    name: "VtsHalSecureElementTargetTest",

    defaults: [

        "VtsHalTargetTestDefaults",

        "use_libaidlvintf_gtest_helper_static",

    ],

    srcs: ["vts/VtsHalSecureElementTargetTest.cpp"],

    shared_libs: [

        "libbinder_ndk",

    ],

    static_libs: [

        "android.hardware.secure_element-V1-ndk",

        "libgmock",

    ],

    test_suites: [

        "general-tests",

        "vts",

    ],

}

secure_element/aidl/aidl_api/android.hardware.secure_element/current/android/hardware/secure_element/ISecureElement.aidl

0 → 100644
+50 −0
Original line number Original line 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.secure_element;

@VintfStability

interface ISecureElement {

  void closeChannel(in byte channelNumber);

  byte[] getAtr();

  void init(in android.hardware.secure_element.ISecureElementCallback clientCallback);

  boolean isCardPresent();

  byte[] openBasicChannel(in byte[] aid, in byte p2);

  android.hardware.secure_element.LogicalChannelResponse openLogicalChannel(in byte[] aid, in byte p2);

  void reset();

  byte[] transmit(in byte[] data);

  const int FAILED = 1;

  const int CHANNEL_NOT_AVAILABLE = 2;

  const int NO_SUCH_ELEMENT_ERROR = 3;

  const int UNSUPPORTED_OPERATION = 4;

  const int IOERROR = 5;

}

secure_element/aidl/aidl_api/android.hardware.secure_element/current/android/hardware/secure_element/ISecureElementCallback.aidl

0 → 100644
+38 −0
Original line number Original line 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.secure_element;

@VintfStability

interface ISecureElementCallback {

  void onStateChange(in boolean connected, in String debugReason);

}

secure_element/aidl/aidl_api/android.hardware.secure_element/current/android/hardware/secure_element/LogicalChannelResponse.aidl

0 → 100644
+39 −0
Original line number Original line 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.secure_element;

@VintfStability

parcelable LogicalChannelResponse {

  byte channelNumber;

  byte[] selectResponse;

}