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

Commit 9cd2322d authored by Orlando Arbildo's avatar Orlando Arbildo Committed by Gerrit Code Review
Browse files

Merge "hwcrypto: Moving hwcrypto files out of staging" into main

parents 06601125 7889729c

compatibility_matrices/compatibility_matrix.202504.xml

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

        </interface>

    </hal>

    <hal format="aidl">

        <name>android.hardware.security.see.hwcrypto</name>

        <version>1</version>

        <interface>

            <name>IHwCryptoKey</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="aidl" updatable-via-apex="true">

        <name>android.hardware.security.secureclock</name>

        <version>1</version>

compatibility_matrices/exclude/fcm_exclude.cpp

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ bool ShouldCheckMissingAidlHalsInFcm(const std::string& packageAndVersion) { 
            // Fastboot HAL is only used by recovery. Recovery is owned by OEM. Framework

            // does not depend on this HAL, hence it is not declared in any manifests or matrices.

            "android.hardware.fastboot@",

            "android.hardware.security.see.hwcrypto.types",

            "android.hardware.security.see.storage",

    };

staging/security/see/hwcrypto/aidl/Android.bp→security/see/hwcrypto/aidl/Android.bp

+7 −5
Original line number Diff line number Diff line
@@ -8,10 +8,8 @@ package { 
}



aidl_interface {

    name: "android.hardware.security.see",

    unstable: false,

    // TODO Remove this owner field when this interface is moved out of /staging

    owner: "google_while_staging",

    name: "android.hardware.security.see.hwcrypto",

    stability: "vintf",

    host_supported: true,

    srcs: [

        "android/hardware/security/see/hwcrypto/*.aidl",
@@ -22,11 +20,15 @@ aidl_interface { 
            enabled: false,

        },

        cpp: {

            enabled: false,

            enabled: true,

        },

        rust: {

            enabled: true,

        },

        ndk: {

            enabled: true,

        },

    },

    frozen: false,

    system_ext_specific: true,

}

staging/security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see/current/android/hardware/security/see/hwcrypto/CryptoOperation.aidl→security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see.hwcrypto/current/android/hardware/security/see/hwcrypto/CryptoOperation.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.see.hwcrypto;

@VintfStability

union CryptoOperation {

  android.hardware.security.see.hwcrypto.MemoryBufferParameter setMemoryBuffer;

  android.hardware.security.see.hwcrypto.OperationParameters setOperationParameters;

staging/security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see/current/android/hardware/security/see/hwcrypto/CryptoOperationErrorAdditionalInfo.aidl→security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see.hwcrypto/current/android/hardware/security/see/hwcrypto/CryptoOperationErrorAdditionalInfo.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.see.hwcrypto;

@VintfStability

parcelable CryptoOperationErrorAdditionalInfo {

  long failingCommandIndex;

}