diff options
author | Tom Cherry <tomcherry@google.com> | 2019-08-28 17:47:49 +0000 |
---|---|---|
committer | Tom Cherry <tomcherry@google.com> | 2019-08-28 17:47:49 +0000 |
commit | 3da2ba6d4aa16e5d087f98c1e8aa3e2e0820deef (patch) | |
tree | ce8954219e3664034069ec15747a401eb4952bf5 /init/builtins.cpp | |
parent | 8efca4bbb378ff5bd3af06d8511ea75a7ed49f99 (diff) |
Revert "Reland: "init: run property service in a thread""
This reverts commit 8efca4bbb378ff5bd3af06d8511ea75a7ed49f99.
Reason for revert: Still broken
Change-Id: I3b37b1b00ff4b19f2eec2d8bd72042463d47cee3
Diffstat (limited to 'init/builtins.cpp')
-rw-r--r-- | init/builtins.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index 3573e34cf..e17e8993c 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; @@ -688,15 +687,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 {}; } |