| commit | 1bb7e2a438d21ebbb1e7231ec72595f4069e4afa | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Sep 16 03:14:02 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 16 03:14:02 2020 +0000 |
| tree | ac0133931e2dda6c8003b64ae0744540df3fe9ec | |
| parent | 49c53ff16f92941cbf3d9002505769fa68519e2f [diff] | |
| parent | 48b6b1c767897ce69e4d4e429b716abfc7b2aa24 [diff] |
Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION" am: 4e6e7e6c70 am: c9548b9d9e am: 48b6b1c767 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1427711 Change-Id: I8704dc372c1deebd87f2e5e52c781fbe3f46978b
diff --git a/EncryptInplace.cpp b/EncryptInplace.cpp index b1bd11d..bdb2da7 100644 --- a/EncryptInplace.cpp +++ b/EncryptInplace.cpp
@@ -49,11 +49,7 @@ /* aligned 32K writes tends to make flash happy. * SD card association recommends it. */ -#ifndef CONFIG_HW_DISK_ENCRYPTION #define BLOCKS_AT_A_TIME 8 -#else -#define BLOCKS_AT_A_TIME 1024 -#endif struct encryptGroupsData { int realfd;