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

Commit 95b03713 authored by Steven Moreland's avatar Steven Moreland Committed by Gerrit Code Review
Browse files

Merge changes from topic "hidl2aidl_gatekeeper" 

* changes:
  hidl2aidl: conversion of gatekeeper vts tests to use aidl service.
  hidl2aidl: conversion of gatekeeper hidl to aidl
parents e8c9684d afb74878

compatibility_matrices/compatibility_matrix.current.xml

+9 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

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

        <name>android.hardware.gatekeeper</name>

        <version>1.0</version>

        <interface>
@@ -249,6 +249,14 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.gatekeeper</name>

        <version>1</version>

        <interface>

            <name>IGatekeeper</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.gnss</name>

        <version>2</version>

gatekeeper/OWNERS

0 → 100644
+2 −0
Original line number Diff line number Diff line 
swillden@google.com

guangzhu@google.com

gatekeeper/aidl/Android.bp

0 → 100644
+29 −0
Original line number Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "hardware_interfaces_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["hardware_interfaces_license"],

}



aidl_interface {

    name: "android.hardware.gatekeeper",

    vendor_available: true,

    imports: [

        "android.hardware.security.keymint-V2",

    ],

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

    stability: "vintf",

    backend: {

        java: {

            platform_apis: true,

        },

        ndk: {

            apps_enabled: false,

        },

        cpp: {

            enabled: false,

        },

    },

}

gatekeeper/aidl/aidl_api/android.hardware.gatekeeper/current/android/hardware/gatekeeper/GatekeeperEnrollResponse.aidl

0 → 100644
+41 −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.gatekeeper;

@VintfStability

parcelable GatekeeperEnrollResponse {

  int statusCode;

  int timeoutMs;

  long secureUserId;

  byte[] data;

}

gatekeeper/aidl/aidl_api/android.hardware.gatekeeper/current/android/hardware/gatekeeper/GatekeeperVerifyResponse.aidl

0 → 100644
+40 −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.gatekeeper;

@VintfStability

parcelable GatekeeperVerifyResponse {

  int statusCode;

  int timeoutMs;

  android.hardware.security.keymint.HardwareAuthToken hardwareAuthToken;

}