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

Commit 78a9a6c3 authored by Shawn Willden's avatar Shawn Willden Committed by Automerger Merge Worker
Browse files

Merge "Move keymint to android.hardware.security." am: 0a897579 am: 640d1c8a am: 5a100136 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60faca04b21a15a3a30d1a0f1d1022363e5f9ace
parents 68d0c71b 5a100136

compatibility_matrices/compatibility_matrix.current.xml

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

    </hal>

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

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

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

        <interface>

            <name>IKeyMintDevice</name>

            <instance>default</instance>

keymint/aidl/default/android.hardware.keymint@1.0-service.rc

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
service vendor.keymint-default /vendor/bin/hw/android.hardware.keymint@1.0-service

    class early_hal

    user nobody

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

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

    name: "android.hardware.keymint",

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

    vendor_available: true,

    srcs: [

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

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

    ],

    stability: "vintf",

    backend: {

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

+0 −0

File moved.

View file

keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/Algorithm.aidl→security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/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.keymint;

package android.hardware.security.keymint;

@Backing(type="int") @VintfStability

enum Algorithm {

  RSA = 1,