PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use flash erase & logical block size for userdata wipe"

Browse Source 
am: c8f7b5bad7

Change-Id: Ie9ad2ca457ecb6bf68a57120bcc504faaabc0871
This commit is contained in:
Connor O'Brien
2017-01-25 04:16:19 +00:00
committed by android-build-merger
parent 343987b2a1 c8f7b5bad7
commit a78bbda4e2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
roots.cpp
View File

@@ -215,7 +215,12 @@ int format_volume(const char* volume, const char* directory) {
}
int result;
if (strcmp(v->fs_type, "ext4") == 0) {
result = make_ext4fs_directory(v->blk_device, length, volume, sehandle, directory);
if (v->erase_blk_size != 0 && v->logical_blk_size != 0) {
result = make_ext4fs_directory_align(v->blk_device, length, volume, sehandle,
directory, v->erase_blk_size, v->logical_blk_size);
} else {
result = make_ext4fs_directory(v->blk_device, length, volume, sehandle, directory);
}
} else { /* Has to be f2fs because we checked earlier. */
if (v->key_loc != NULL && strcmp(v->key_loc, "footer") == 0 && length < 0) {
LOG(ERROR) << "format_volume: crypt footer + negative length (" << length