| commit | c9548b9d9ed2b0182fdd8da849fd899fd1eb3261 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Sep 16 02:04:55 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 16 02:04:55 2020 +0000 |
| tree | ac0133931e2dda6c8003b64ae0744540df3fe9ec | |
| parent | 58383d92c6cfad78f6c0ed324be36ba996b0b2f3 [diff] | |
| parent | 4e6e7e6c70a881b9d69bd7b68540b91aca2f47a2 [diff] |
Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION" am: 4e6e7e6c70 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1427711 Change-Id: I0254ee7e493f98a78476f2e939884185b04d10c0
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;