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

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

Merge "Update to KeyMint & iRPC v2" am: 8e4b2bfd 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2002271

Change-Id: I1207f05e419109cc38f8944d7b1b1ce9fbaef87b
parents 793e1777 8e4b2bfd

trusty/keymaster/keymint/TEST_MAPPING

0 → 100644
+7 −0
Original line number Diff line number Diff line 
{

  "presubmit" : [

    {

      "name" : "vts_treble_vintf_framework_test"

    }

  ]

}
 
 No newline at end of file

trusty/keymaster/keymint/android.hardware.security.keymint-service.trusty.xml

+2 −0
Original line number Diff line number Diff line 
<manifest version="1.0" type="device">

    <hal format="aidl">

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

        <version>2</version>

        <fqname>IKeyMintDevice/default</fqname>

    </hal>

    <hal format="aidl">
@@ -13,6 +14,7 @@ 
    </hal>

    <hal format="aidl">

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

        <version>2</version>

        <fqname>IRemotelyProvisionedComponent/default</fqname>

    </hal>

</manifest>