diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-07-07 17:05:58 +0000 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2015-07-07 17:05:58 +0000 |
| commit | 437bc5dceca1608456c1c40b694645bc2d100ad4 (patch) | |
| tree | b1c50ad382ddbd968b29d2b1e87a985569150859 /init/builtins.cpp | |
| parent | d815178b7512cb44d8b5f234e3f823b5a3e44dea (diff) | |
Revert "Change init sequence to support file level encryption"
This reverts commit d815178b7512cb44d8b5f234e3f823b5a3e44dea.
Change-Id: I7e3f55d3092fcd04ea9f62f1971c9d42570f096c
Diffstat (limited to 'init/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index 64a363e98..9e5f9ff89 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -803,9 +803,9 @@ int do_load_persist_props(int nargs, char **args) { return -1; } -int do_load_system_props(int nargs, char **args) { +int do_load_all_props(int nargs, char **args) { if (nargs == 1) { - load_system_props(); + load_all_props(); return 0; } return -1; |