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

Commit f56ef2c8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Security: Provide generated java sources." am: 2d56123a 

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

Change-Id: I68ba56a96ed0717c3fb43bad66b6150cfce0fbd9
parents c127d95b 2d56123a

security/keymint/aidl/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ aidl_interface { 
    stability: "vintf",

    backend: {

        java: {

            sdk_version: "module_current",

            platform_apis: true,

            srcs_available: true,

        },

        ndk: {

            vndk: {

security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Algorithm.aidl

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.security.keymint;

/* @hide */

@Backing(type="int") @VintfStability

enum Algorithm {

  RSA = 1,

security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/AttestationKey.aidl

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.security.keymint;

/* @hide */

@RustDerive(Clone=true, Eq=true, Hash=true, Ord=true, PartialEq=true, PartialOrd=true) @VintfStability

parcelable AttestationKey {

  byte[] keyBlob;

security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/BeginResult.aidl

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.security.keymint;

/* @hide */

@VintfStability

parcelable BeginResult {

  long challenge;

security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/BlockMode.aidl

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.security.keymint;

/* @hide */

@Backing(type="int") @VintfStability

enum BlockMode {

  ECB = 1,