summaryrefslogtreecommitdiffstats
path: root/simulator
diff options
context:
space:
mode:
authorAndy McFadden <fadden@android.com>2009-06-08 10:08:18 -0700
committerAndy McFadden <fadden@android.com>2009-06-08 10:08:18 -0700
commit3c5497ca99d5aeb374ad7f21cf7615fcc706db61 (patch)
tree1c2e0caad9800b5003ab7ef8c780775a367b140f /simulator
parentbd45dfcdaaa1639007ee3933c277e2ac53685019 (diff)
downloadandroid_development-3c5497ca99d5aeb374ad7f21cf7615fcc706db61.tar.gz
android_development-3c5497ca99d5aeb374ad7f21cf7615fcc706db61.tar.bz2
android_development-3c5497ca99d5aeb374ad7f21cf7615fcc706db61.zip
Add missing system properties to sim.
The framework cannot start if certain properties are missing. This adds a couple of properties used by the backup system. Also fixed a trio of printf/size_t warnings.
Diffstat (limited to 'simulator')
-rw-r--r--simulator/app/PropertyServer.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/simulator/app/PropertyServer.cpp b/simulator/app/PropertyServer.cpp
index 4b1aedd68..0047b5dd4 100644
--- a/simulator/app/PropertyServer.cpp
+++ b/simulator/app/PropertyServer.cpp
@@ -110,6 +110,8 @@ void PropertyServer::SetDefaultProperties(void)
{ "ro.EMPTY_APP_MEM", "16384" },
{ "ro.HOME_APP_ADJ", "4" },
{ "ro.HOME_APP_MEM", "4096" },
+ { "ro.BACKUP_APP_ADJ", "2" },
+ { "ro.BACKUP_APP_MEM", "4096" },
//{ "init.svc.adbd", "running" }, // causes ADB-JDWP
{ "init.svc.usbd", "running" },
{ "init.svc.debuggerd", "running" },
@@ -180,7 +182,7 @@ bool PropertyServer::GetProperty(const char* key, char* valueBuf)
if (strlen(prop.value) >= PROPERTY_VALUE_MAX) {
fprintf(stderr,
"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();
}
assert(strlen(prop.value) < PROPERTY_VALUE_MAX);
@@ -323,7 +325,7 @@ bool PropertyServer::HandleRequest(int fd)
if (actual != PROPERTY_KEY_MAX) {
fprintf(stderr, "Bad read on get: %d of %d\n",
- actual, PROPERTY_KEY_MAX);
+ (int) actual, PROPERTY_KEY_MAX);
return false;
}
if (GetProperty(reqBuf, valueBuf+1))
@@ -340,7 +342,7 @@ bool PropertyServer::HandleRequest(int fd)
actual = read(fd, reqBuf, PROPERTY_KEY_MAX + PROPERTY_VALUE_MAX);
if (actual != PROPERTY_KEY_MAX + PROPERTY_VALUE_MAX) {
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;
}
//printf("SET property '%s'\n", reqBuf);