Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a360f292 authored by San Mehat's avatar San Mehat Committed by Android Git Automerger
Browse files

am 4ad30d28: Merge change 23106 into eclair 

Merge commit '4ad30d28' into eclair-plus-aosp

* commit '4ad30d28':
  vold: Format cards < 2GB as FAT16, otherwise FAT32. Also let the formatter
parents cc61802b 4ad30d28

vold/format.c

+12 −10
Original line number Diff line number Diff line
@@ -37,17 +37,19 @@ int format_partition(blkdev_t *part, char *type) 
    devpath = blkdev_get_devpath(part);



    if (!strcmp(type, FORMAT_TYPE_FAT32)) {

        char *args[9];

        char *args[7];

        args[0] = MKDOSFS_PATH;

        args[1] = "-F";

	if ((part->nr_sec * 512) <= (unsigned int) (1024*1024*1024*2))

        	args[2] = "16";

	else

        	args[2] = "32";

        args[3] = "-c";

        args[4] = "16";

        args[5] = "-O";

        args[6] = "android";

        args[7] = devpath;

        args[8] = NULL;

        rc = logwrap(8, args, 1);



        args[3] = "-O";

        args[4] = "android";

        args[5] = devpath;

        args[6] = NULL;

        rc = logwrap(7, args, 1);

    } else {

        char *args[7];

        args[0] = MKE2FS_PATH;