diff options
author | Shawn Willden <swillden@google.com> | 2015-04-10 20:53:27 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-10 20:53:27 +0000 |
commit | b8615afc7058a03f0a5bb1c6615c3eaf4606bce0 (patch) | |
tree | 388783a9b55d1302954eb7fc5f705a1c9570037b /include | |
parent | 0acfbbeb53bb7222609ee769f815d81a94635a55 (diff) | |
parent | b9554eedc782391eb5304c03a0bf8f01b0280499 (diff) | |
download | hardware_libhardware-b8615afc7058a03f0a5bb1c6615c3eaf4606bce0.zip hardware_libhardware-b8615afc7058a03f0a5bb1c6615c3eaf4606bce0.tar.gz hardware_libhardware-b8615afc7058a03f0a5bb1c6615c3eaf4606bce0.tar.bz2 |
am b9554eed: am 614e69d4: Merge "Correct return type of delete_all_keys."
* commit 'b9554eedc782391eb5304c03a0bf8f01b0280499':
Correct return type of delete_all_keys.
Diffstat (limited to 'include')
-rw-r--r-- | include/hardware/keymaster1.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/hardware/keymaster1.h b/include/hardware/keymaster1.h index dae3b8e..4227f57 100644 --- a/include/hardware/keymaster1.h +++ b/include/hardware/keymaster1.h @@ -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 |