Merge tag 'android-6.0.0_r26' into cm-13.0

Android 6.0.0 release 26

Change-Id: I03ff70b242510f7cecbbc319b3f4a50138bacd48

1 files changed, 1 insertions, 0 deletions

diff --git a/aes_key.h b/aes_key.h
index 9c58647..fad4569 100644
--- a/aes_key.h
+++ b/aes_key.h
@@ -33,6 +33,7 @@ class AesKeyFactory : public SymmetricKeyFactory {
     keymaster_algorithm_t registry_key() const { return KM_ALGORITHM_AES; }
 
     keymaster_error_t LoadKey(const KeymasterKeyBlob& key_material,
+                              const AuthorizationSet& additional_params,
                               const AuthorizationSet& hw_enforced,
                               const AuthorizationSet& sw_enforced,
                               UniquePtr<Key>* key) const override;