Merge "load selinux property_contexts in /odm and /product" (7e6dc56b) · Commits · e / os / android_system_core

init/property_service.cpp

+9 −0

Original line number	Diff line number	Diff line
		@@ -908,6 +908,13 @@ void CreateSerializedPropertyInfo() {
		LoadPropertyInfoFromFile("/vendor/etc/selinux/nonplat_property_contexts",
		&property_infos);
		}
		if (access("/product/etc/selinux/product_property_contexts", R_OK) != -1) {
		LoadPropertyInfoFromFile("/product/etc/selinux/product_property_contexts",
		&property_infos);
		}
		if (access("/odm/etc/selinux/odm_property_contexts", R_OK) != -1) {
		LoadPropertyInfoFromFile("/odm/etc/selinux/odm_property_contexts", &property_infos);
		}
		} else {
		if (!LoadPropertyInfoFromFile("/plat_property_contexts", &property_infos)) {
		return;
		@@ -916,6 +923,8 @@ void CreateSerializedPropertyInfo() {
		// Fallback to nonplat_* if vendor_* doesn't exist.
		LoadPropertyInfoFromFile("/nonplat_property_contexts", &property_infos);
		}
		LoadPropertyInfoFromFile("/product_property_contexts", &property_infos);
		LoadPropertyInfoFromFile("/odm_property_contexts", &property_infos);
		}

		auto serialized_contexts = std::string();