am 614e69d4: Merge "Correct return type of delete_all_keys."

* commit '614e69d4a212c1e9bddecb2cb2183d20117a8650':
  Correct return type of delete_all_keys.
This commit is contained in:
Shawn Willden 2015-04-10 20:32:47 +00:00 committed by Android Git Automerger
commit b9554eedc7

View file

@ -466,10 +466,8 @@ struct keymaster1_device {
* This function is optional and should be set to NULL if it is not implemented.
*
* \param[in] dev The keymaster device structure.
*
* Returns 0 on success or an error code less than 0.
*/
int (*delete_all_keys)(const struct keymaster1_device* dev);
keymaster_error_t (*delete_all_keys)(const struct keymaster1_device* dev);
/**
* Begins a cryptographic operation using the specified key. If all is well, begin() will