commit 3c8dc2ffdd42af559a594881e01c41b18de8b9b3
author Mike Lockwood <lockwood@android.com> Wed Sep 07 17:51:48 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 07 17:51:48 2011 -0700
tree 83a05e58ff557914e4704c1e228387e1ea8827cb
parent ebf46586f57e580d0195a06c32103ea393314f01
parent 8a7fbf0cf36c134f93cdac06411413eb8b0561b6

Merge "init: Increase buffer size for serialno and other properties set from kernel command line" into ics-aah

init/init.c

diff --git a/init/init.c b/init/init.c
index 5bd2525..f84eb18 100755
--- a/init/init.c
+++ b/init/init.c
@@ -548,8 +548,12 @@
 
 static int property_init_action(int nargs, char **args)
 {
+    bool load_defaults = true;
+
     INFO("property init\n");
-    property_init();
+    if (!strcmp(bootmode, "charger"))
+        load_defaults = false;
+    property_init(load_defaults);
     return 0;
 }
 

init/property_service.c

diff --git a/init/property_service.c b/init/property_service.c
index 18231e8..6733437 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -505,10 +505,11 @@
     persistent_properties_loaded = 1;
 }
 
-void property_init(void)
+void property_init(bool load_defaults)
 {
     init_property_area();
-    load_properties_from_file(PROP_PATH_RAMDISK_DEFAULT);
+    if (load_defaults)
+        load_properties_from_file(PROP_PATH_RAMDISK_DEFAULT);
 }
 
 int properties_inited(void)

init/property_service.h

diff --git a/init/property_service.h b/init/property_service.h
index bc97cc4..37c2788 100644
--- a/init/property_service.h
+++ b/init/property_service.h
@@ -17,8 +17,10 @@
 #ifndef _INIT_PROPERTY_H
 #define _INIT_PROPERTY_H
 
+#include <stdbool.h>
+
 extern void handle_property_set_fd(void);
-extern void property_init(void);
+extern void property_init(bool load_defaults);
 extern void load_persist_props(void);
 extern void start_property_service(void);
 void get_property_workspace(int *fd, int *sz);