Merge "Revert "Reland: "init: run property service in a thread"""

1 files changed, 0 insertions, 10 deletions

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 8c4d9898d..7c66de5f8 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -80,7 +80,6 @@
 using namespace std::literals::string_literals;
 
 using android::base::Basename;
-using android::base::StartsWith;
 using android::base::unique_fd;
 using android::fs_mgr::Fstab;
 using android::fs_mgr::ReadFstabFromFile;
@@ -701,15 +700,6 @@ static Result<void> do_swapon_all(const BuiltinArguments& args) {
 }
 
 static Result<void> do_setprop(const BuiltinArguments& args) {
-    if (StartsWith(args[1], "ctl.")) {
-        return Error() << "InitPropertySet: Do not set ctl. properties from init; call the Service "
-                          "functions directly";
-    }
-    if (args[1] == kRestoreconProperty) {
-        return Error() << "InitPropertySet: Do not set '" << kRestoreconProperty
-                       << "' from init; use the restorecon builtin directly";
-    }
-
     property_set(args[1], args[2]);
     return {};
 }