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

Commit 1ffcdeba authored by Orion Hodson's avatar Orion Hodson
Browse files

Revert "Move keymint to android.hardware.security." 

Revert "Keystore 2.0 SPI: Move keymint spec to security namespace."

Revert "Keystore 2.0: Move keymint spec to security namespace."

Revert "Keystore 2.0: Move keymint spec to security namespace."

Revert "Move keymint to android.hardware.security."

Revert "Configure CF to start KeyMint service by default."

Revert "Move keymint to android.hardware.security."

Revert "Move keymint to android.hardware.security."

Revert submission 1522123-move_keymint

Reason for revert: Build breakage
Bug: 175345910
Bug: 171429297
Reverted Changes:
Ief0e9884a:Keystore 2.0: Move keymint spec to security namesp...
Idb54e8846:Keystore 2.0: Move keymint spec to security namesp...
I9f70db0e4:Remove references to keymint1
I2b4ce3349:Keystore 2.0 SPI: Move keymint spec to security na...
I2498073aa:Move keymint to android.hardware.security.
I098711e7d:Move keymint to android.hardware.security.
I3ec8d70fe:Configure CF to start KeyMint service by default.
Icbb373c50:Move keymint to android.hardware.security.
I86bccf40e:Move keymint to android.hardware.security.

Change-Id: I160cae568ed6b15698bd0af0b19c6c949528762d
parent f73e952e

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;

}