ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am e1df9ad2: Merge "init: Don\'t read local properties if ro.debuggable=0" into jb-mr1-dev

Browse source 
* commit 'e1df9ad215af6e51a2d8fb1d0306e00c7b510b62':
  init: Don't read local properties if ro.debuggable=0
This commit is contained in:
Nick Kralevich 2012-09-20 06:20:21 -07:00 • committed by Android Git Automerger
commit 400b89b218
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
init/property_service.c
View file

@ -582,6 +582,16 @@ int properties_inited(void)
return property_area_inited;
}
static void load_override_properties() {
#ifdef ALLOW_LOCAL_PROP_OVERRIDE
const char *debuggable = property_get("ro.debuggable");
if (debuggable && (strcmp(debuggable, "1") == 0)) {
load_properties_from_file(PROP_PATH_LOCAL_OVERRIDE);
}
#endif /* ALLOW_LOCAL_PROP_OVERRIDE */
}
/* 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
@ -589,9 +599,7 @@ int properties_inited(void)
*/
void load_persist_props(void)
{
#ifdef ALLOW_LOCAL_PROP_OVERRIDE
load_properties_from_file(PROP_PATH_LOCAL_OVERRIDE);
#endif /* ALLOW_LOCAL_PROP_OVERRIDE */
load_override_properties();
/* Read persistent properties after all default values have been loaded. */
load_persistent_properties();
}
@ -602,9 +610,7 @@ void start_property_service(void)
load_properties_from_file(PROP_PATH_SYSTEM_BUILD);
load_properties_from_file(PROP_PATH_SYSTEM_DEFAULT);
#ifdef ALLOW_LOCAL_PROP_OVERRIDE
load_properties_from_file(PROP_PATH_LOCAL_OVERRIDE);
#endif /* ALLOW_LOCAL_PROP_OVERRIDE */
load_override_properties();
/* Read persistent properties after all default values have been loaded. */
load_persistent_properties();