Merge "Corrupt the PersistentDataBlock payload explicitly in factory reset"

This commit is contained in:
Howard Chen
2021-05-25 01:43:25 +00:00
committed by Gerrit Code Review

View File

@@ -38,11 +38,9 @@ import com.android.internal.annotations.GuardedBy;
import libcore.io.IoUtils;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
@@ -375,11 +373,16 @@ public class PersistentDataBlockService extends SystemService {
try {
FileChannel channel = getBlockOutputChannel();
ByteBuffer buf = ByteBuffer.allocate(DIGEST_SIZE_BYTES + HEADER_SIZE);
int header_size = DIGEST_SIZE_BYTES + HEADER_SIZE;
ByteBuffer buf = ByteBuffer.allocate(header_size);
buf.put(new byte[DIGEST_SIZE_BYTES]);
buf.putInt(PARTITION_TYPE_MARKER);
buf.putInt(0);
channel.write(buf);
// corrupt the payload explicitly
int payload_size = (int) getBlockDeviceSize() - header_size;
buf = ByteBuffer.allocate(payload_size);
channel.write(buf);
channel.force(true);
} catch (IOException e) {
Slog.e(TAG, "failed to format block", e);