am e1df9ad2: Merge "init: Don\'t read local properties if ro.debuggable=0" into jb-mr1-dev (a8b91609) · Commits · e / os / android_system_core

init/property_service.c

+12 −6

Original line number	Original line	Diff line number	Diff line
	@@ -582,6 +582,16 @@ int properties_inited(void)
	return property_area_inited;		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		/* When booting an encrypted system, /data is not mounted when the
	* property service is started, so any properties stored there are		* property service is started, so any properties stored there are
	* not loaded. Vold triggers init to load these properties once it		* not loaded. Vold triggers init to load these properties once it
	@@ -589,9 +599,7 @@ int properties_inited(void)
	*/		*/
	void load_persist_props(void)		void load_persist_props(void)
	{		{
	#ifdef ALLOW_LOCAL_PROP_OVERRIDE		load_override_properties();
	load_properties_from_file(PROP_PATH_LOCAL_OVERRIDE);
	#endif /* ALLOW_LOCAL_PROP_OVERRIDE */
	/* Read persistent properties after all default values have been loaded. */		/* Read persistent properties after all default values have been loaded. */
	load_persistent_properties();		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_BUILD);
	load_properties_from_file(PROP_PATH_SYSTEM_DEFAULT);		load_properties_from_file(PROP_PATH_SYSTEM_DEFAULT);
	#ifdef ALLOW_LOCAL_PROP_OVERRIDE		load_override_properties();
	load_properties_from_file(PROP_PATH_LOCAL_OVERRIDE);
	#endif /* ALLOW_LOCAL_PROP_OVERRIDE */
	/* Read persistent properties after all default values have been loaded. */		/* Read persistent properties after all default values have been loaded. */
	load_persistent_properties();		load_persistent_properties();