Merge change 4263 into donut

* changes:
  Add missing system properties to sim.
This commit is contained in:
Android (Google) Code Review
2009-06-15 16:54:07 -07:00

View File

@@ -110,6 +110,8 @@ void PropertyServer::SetDefaultProperties(void)
{ "ro.EMPTY_APP_MEM", "16384" }, { "ro.EMPTY_APP_MEM", "16384" },
{ "ro.HOME_APP_ADJ", "4" }, { "ro.HOME_APP_ADJ", "4" },
{ "ro.HOME_APP_MEM", "4096" }, { "ro.HOME_APP_MEM", "4096" },
{ "ro.BACKUP_APP_ADJ", "2" },
{ "ro.BACKUP_APP_MEM", "4096" },
//{ "init.svc.adbd", "running" }, // causes ADB-JDWP //{ "init.svc.adbd", "running" }, // causes ADB-JDWP
{ "init.svc.usbd", "running" }, { "init.svc.usbd", "running" },
{ "init.svc.debuggerd", "running" }, { "init.svc.debuggerd", "running" },
@@ -180,7 +182,7 @@ bool PropertyServer::GetProperty(const char* key, char* valueBuf)
if (strlen(prop.value) >= PROPERTY_VALUE_MAX) { if (strlen(prop.value) >= PROPERTY_VALUE_MAX) {
fprintf(stderr, fprintf(stderr,
"GLITCH: properties table holds '%s' '%s' (len=%d)\n", "GLITCH: properties table holds '%s' '%s' (len=%d)\n",
prop.key, prop.value, strlen(prop.value)); prop.key, prop.value, (int) strlen(prop.value));
abort(); abort();
} }
assert(strlen(prop.value) < PROPERTY_VALUE_MAX); assert(strlen(prop.value) < PROPERTY_VALUE_MAX);
@@ -323,7 +325,7 @@ bool PropertyServer::HandleRequest(int fd)
if (actual != PROPERTY_KEY_MAX) { if (actual != PROPERTY_KEY_MAX) {
fprintf(stderr, "Bad read on get: %d of %d\n", fprintf(stderr, "Bad read on get: %d of %d\n",
actual, PROPERTY_KEY_MAX); (int) actual, PROPERTY_KEY_MAX);
return false; return false;
} }
if (GetProperty(reqBuf, valueBuf+1)) if (GetProperty(reqBuf, valueBuf+1))
@@ -340,7 +342,7 @@ bool PropertyServer::HandleRequest(int fd)
actual = read(fd, reqBuf, PROPERTY_KEY_MAX + PROPERTY_VALUE_MAX); actual = read(fd, reqBuf, PROPERTY_KEY_MAX + PROPERTY_VALUE_MAX);
if (actual != PROPERTY_KEY_MAX + PROPERTY_VALUE_MAX) { if (actual != PROPERTY_KEY_MAX + PROPERTY_VALUE_MAX) {
fprintf(stderr, "Bad read on set: %d of %d\n", fprintf(stderr, "Bad read on set: %d of %d\n",
actual, PROPERTY_KEY_MAX + PROPERTY_VALUE_MAX); (int) actual, PROPERTY_KEY_MAX + PROPERTY_VALUE_MAX);
return false; return false;
} }
//printf("SET property '%s'\n", reqBuf); //printf("SET property '%s'\n", reqBuf);