Merge change 23045 into eclair
* changes:
Add persistent radio prop perms ; cleanup ws and typos.
diff --git a/libacc/acc.cpp b/libacc/acc.cpp
index 0409c10..535361c 100644
--- a/libacc/acc.cpp
+++ b/libacc/acc.cpp
@@ -3837,7 +3837,7 @@
void assertImpl(bool isTrue, int line) {
if (!isTrue) {
- LOGD("assertion failed at line %s:%d.", __FILE__, line);
+ LOGD("%d: assertion failed at line %s:%d.", mLineNumber, __FILE__, line);
internalError();
}
}
@@ -5220,7 +5220,6 @@
String temp;
decodeToken(temp, tok, true);
error("Expected name. Got %s", temp.getUnwrapped());
- assert(false);
reportFailure = true;
}
for(;;) {
diff --git a/vold/format.c b/vold/format.c
index cd40197..c67b358 100755
--- a/vold/format.c
+++ b/vold/format.c
@@ -33,21 +33,23 @@
{
char *devpath;
int rc = -EINVAL;
-
+
devpath = blkdev_get_devpath(part);
if (!strcmp(type, FORMAT_TYPE_FAT32)) {
- char *args[9];
+ char *args[7];
args[0] = MKDOSFS_PATH;
args[1] = "-F";
- 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);
+ if ((part->nr_sec * 512) <= (unsigned int) (1024*1024*1024*2))
+ args[2] = "16";
+ else
+ args[2] = "32";
+
+ 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;