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

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

Merge "Correct the description for getKeyCharacteristics" am: e8d43f7e am:... 

Merge "Correct the description for getKeyCharacteristics" am: e8d43f7e am: bb1b56ab am: bf3990ca am: fe7eac4e

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

Change-Id: I7efe5822e1409070e2e6acaa0ab7396154586615
parents f48ab20b fe7eac4e

security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl

+4 −3
Original line number Diff line number Diff line
@@ -805,9 +805,10 @@ interface IKeyMintDevice { 
    byte[] convertStorageKeyToEphemeral(in byte[] storageKeyBlob);



    /**

     * Returns parameters associated with the provided key. This should match the

     * KeyCharacteristics present in the KeyCreationResult returned by generateKey(),

     * importKey(), or importWrappedKey().

     * Returns KeyMint-enforced parameters associated with the provided key. The returned tags are

     * a subset of KeyCharacteristics found in the KeyCreationResult returned by generateKey(),

     * importKey(), or importWrappedKey(). The returned value is a subset, as it does not include

     * any Keystore-enforced parameters.

     *

     * @param keyBlob The opaque descriptor returned by generateKey, importKey or importWrappedKey.

     *