Merge "Fix warning in system/vold/tests." am: b96ed7e6e0

am: 447f1874b4

Change-Id: I9e5db0fe14e7701b20c27e0c2074fb23496f59aa
This commit is contained in:
Chih-hung Hsieh 2017-12-11 23:31:50 +00:00 committed by android-build-merger
commit c025ce8806

View file

@ -369,6 +369,7 @@ static int keymaster_check_compatibility_new()
return keymaster_compatibility_cryptfs_scrypt();
}
#if 0
/* Create a new keymaster key and store it in this footer */
static int keymaster_create_key_new(struct crypt_mnt_ftr *ftr)
{
@ -390,6 +391,7 @@ static int keymaster_create_key_new(struct crypt_mnt_ftr *ftr)
}
return 0;
}
#endif
/* This signs the given object using the keymaster key. */
static int keymaster_sign_object_new(struct crypt_mnt_ftr *ftr,