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

Commit b72e61b6 authored by Jiyong Park's avatar Jiyong Park Committed by Automerger Merge Worker
Browse files

Merge "Freeze AIDL APIs for TM" into tm-dev am: 07be4bfb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17754933



Change-Id: I3d85907f4304a7dc6099a2a10c9b0dc45e7645ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 039e27fc 07be4bfb

media/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -120,6 +120,13 @@ aidl_interface { 
            ],

        },

    },

    versions_with_info: [

        {

            version: "1",

            imports: [],

        },

    ],



}



aidl_interface {

omapi/aidl/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -29,4 +29,11 @@ aidl_interface { 
            enabled: true,

        },

    },

    versions_with_info: [

        {

            version: "1",

            imports: [],

        },

    ],



}

omapi/aidl/aidl_api/android.se.omapi/1/.hash

0 → 100644
+1 −0
Original line number Diff line number Diff line 
894069bcfe4f35ceb2088278ddf87c83adee8014

omapi/aidl/aidl_api/android.se.omapi/1/android/se/omapi/ISecureElementChannel.aidl

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

 * Copyright (C) 2017, 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.

 *//*

 * Contributed by: Giesecke & Devrient GmbH.

 */

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

// 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.se.omapi;

/* @hide */

@VintfStability

interface ISecureElementChannel {

  void close();

  boolean isClosed();

  boolean isBasicChannel();

  byte[] getSelectResponse();

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

  boolean selectNext();

}

omapi/aidl/aidl_api/android.se.omapi/1/android/se/omapi/ISecureElementListener.aidl

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

 * Copyright (C) 2017, 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.

 *//*

 * Contributed by: Giesecke & Devrient GmbH.

 */

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

// 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.se.omapi;

/* @hide */

@VintfStability

interface ISecureElementListener {

}