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

Commit 9b91af67 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "Revert "identity - temp interface change"" am: 9624940b 

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



Change-Id: Ieda098ed0f73983c70bdbcef6f8565bf7a428b1d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 213ee1b1 9624940b

identity/aidl/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ aidl_interface { 
        "android.hardware.security.keymint-V3",

    ],

    stability: "vintf",

    frozen: false,

    backend: {

        java: {

            platform_apis: true,

identity/aidl/aidl_api/android.hardware.identity/current/android/hardware/identity/B237048744.aidl

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
/*

 * Copyright 2020 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.identity;

@VintfStability

enum B237048744 {

  V5 = 0,

}

identity/aidl/android/hardware/identity/B237048744.aidl

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
/*

 * Copyright 2020 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.

 */



package android.hardware.identity;



@VintfStability

enum B237048744 {

    V5 /* bump only includes import changes */,

}