1 files changed, 12 insertions, 0 deletions
diff --git a/init/property_service.c b/init/property_service.c
index fdfec43db..be56a193f 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -515,6 +515,18 @@ int properties_inited(void)
     return property_area_inited;
 }
 
+/* When booting an encrypted system, /data is not mounted when the
+ * property service is started, so any properties stored there are
+ * not loaded.  Vold triggers init to load these properties once it
+ * has mounted /data.
+ */
+void load_persist_props(void)
+{
+    load_properties_from_file(PROP_PATH_LOCAL_OVERRIDE);
+    /* Read persistent properties after all default values have been loaded. */
+    load_persistent_properties();
+}
+
 void start_property_service(void)
 {
     int fd;