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

Commit fdc32ed3 authored by Orion Hodson's avatar Orion Hodson Committed by Automerger Merge Worker
Browse files

Merge "Revert "Move keymint to android.hardware.security."" am: 495ceb90 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff93d3ee047dc5dc5584d944e1e9a0a3d639cbc8
parents 962bd5be 495ceb90

compatibility_matrices/compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ 
        </interface>

    </hal>

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

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

        <name>android.hardware.keymint</name>

        <interface>

            <name>IKeyMintDevice</name>

            <instance>default</instance>

security/keymint/aidl/Android.bp→keymint/aidl/Android.bp

+2 −2
Original line number Diff line number Diff line 
aidl_interface {

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

    name: "android.hardware.keymint",

    vendor_available: true,

    srcs: [

        "android/hardware/security/keymint/*.aidl",

        "android/hardware/keymint/*.aidl",

    ],

    stability: "vintf",

    backend: {

security/keymint/aidl/OWNERS→keymint/aidl/OWNERS

+0 −0

File moved.

View file

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
// 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.security.keymint;

package android.hardware.keymint;

@Backing(type="int") @VintfStability

enum Algorithm {

  RSA = 1,

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

+3 −3
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
// 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.security.keymint;

package android.hardware.keymint;

@VintfStability

parcelable BeginResult {

  long challenge;

  android.hardware.security.keymint.KeyParameter[] params;

  android.hardware.security.keymint.IKeyMintOperation operation;

  android.hardware.keymint.KeyParameter[] params;

  android.hardware.keymint.IKeyMintOperation operation;

}