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

Commit e8d43f7e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Correct the description for getKeyCharacteristics"

parents 53bd1cc9 fa3d38d2

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

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

    byte[] convertStorageKeyToEphemeral(in byte[] storageKeyBlob);





    /**

    /**

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

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

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

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

     * importKey(), or importWrappedKey().

     * 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.

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

     *

     *