| commit | 46f8c2b954e11c2266871b8110b74bd6a11f3661 | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Fri Nov 15 14:21:32 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 15 14:21:32 2013 -0800 |
| tree | 9d1c95ef90ad9a6cadbccd60eb37168754cdb3b9 | |
| parent | 86697c72ae29661ad64cfd7b134fa3d3215e0cc3 [diff] | |
| parent | 7bdfa52d934465e2182e2f1c200c4d8581ad5da6 [diff] |
am 7bdfa52d: vold: cryptfs: Don\'t update KDF without validating pwd/key. * commit '7bdfa52d934465e2182e2f1c200c4d8581ad5da6': vold: cryptfs: Don't update KDF without validating pwd/key.
diff --git a/DirectVolume.h b/DirectVolume.h index 7be133f..beda7c3 100644 --- a/DirectVolume.h +++ b/DirectVolume.h
@@ -21,8 +21,6 @@ #include "Volume.h" -#define MAX_PARTS 4 - typedef android::List<char *> PathCollection; class DirectVolume : public Volume {