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

Commit 1b7bec00 authored by Steven Moreland's avatar Steven Moreland Committed by Gerrit Code Review
Browse files

Merge changes from topic "hidl2aidl_confirmationui" 

* changes:
  hidl2aidl: conversion of vts confirmationui hidl to aidl
  hidl2aidl: conversion of confirmationui hidl to aidl
parents 59b028b6 2e95fa2b

compatibility_matrices/compatibility_matrix.current.xml

+8 −0
Original line number Diff line number Diff line
@@ -207,6 +207,14 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.confirmationui</name>

        <version>1</version>

        <interface>

            <name>IConfirmationUI</name>

            <instance>default</instance>

        </interface>

    </hal>

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

        <name>android.hardware.contexthub</name>

        <interface>

confirmationui/OWNERS

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

subrahmanyaman@google.com

confirmationui/aidl/Android.bp

0 → 100644
+38 −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.



package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}



aidl_interface {

    name: "android.hardware.confirmationui",

    vendor_available: true,

    imports: [

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

    ],

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

    stability: "vintf",

    backend: {

        java: {

            platform_apis: true,

        },

        ndk: {

            apps_enabled: false,

        },

        cpp: {

            enabled: false,

        },

    },

}

confirmationui/aidl/aidl_api/android.hardware.confirmationui/current/android/hardware/confirmationui/IConfirmationResultCallback.aidl

0 → 100644
+38 −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.confirmationui;

@VintfStability

interface IConfirmationResultCallback {

  void result(in int error, in byte[] formattedMessage, in byte[] confirmationToken);

}

confirmationui/aidl/aidl_api/android.hardware.confirmationui/current/android/hardware/confirmationui/IConfirmationUI.aidl

0 → 100644
+54 −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.confirmationui;

@VintfStability

interface IConfirmationUI {

  void abort();

  void deliverSecureInputEvent(in android.hardware.security.keymint.HardwareAuthToken secureInputToken);

  void promptUserConfirmation(in android.hardware.confirmationui.IConfirmationResultCallback resultCB, in byte[] promptText, in byte[] extraData, in @utf8InCpp String locale, in android.hardware.confirmationui.UIOption[] uiOptions);

  const int OK = 0;

  const int CANCELED = 1;

  const int ABORTED = 2;

  const int OPERATION_PENDING = 3;

  const int IGNORED = 4;

  const int SYSTEM_ERROR = 5;

  const int UNIMPLEMENTED = 6;

  const int UNEXPECTED = 7;

  const int UI_ERROR = 65536;

  const int UI_ERROR_MISSING_GLYPH = 65537;

  const int UI_ERROR_MESSAGE_TOO_LONG = 65538;

  const int UI_ERROR_MALFORMED_UTF8ENCODING = 65539;

  const int TEST_KEY_BYTE = 165;

  const int MAX_MESSAGE_SIZE = 6144;

}