Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f89e5c34 authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "init: wait_for_prop shouldn't run in a subcontext" am: 6e529736 am:... 

Merge "init: wait_for_prop shouldn't run in a subcontext" am: 6e529736 am: cadc34fd am: fe08631f
am: 4d4cc092

Change-Id: I911953227eb43acda43f8475afe1202fa2fce727
parents cc0bc356 4d4cc092

init/builtins.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1033,7 +1033,7 @@ const BuiltinFunctionMap::Map& BuiltinFunctionMap::map() const { 
        {"verity_load_state",       {0,     0,    {false,  do_verity_load_state}}},

        {"verity_update_state",     {0,     0,    {false,  do_verity_update_state}}},

        {"wait",                    {1,     2,    {true,   do_wait}}},

        {"wait_for_prop",           {2,     2,    {true,   do_wait_for_prop}}},

        {"wait_for_prop",           {2,     2,    {false,  do_wait_for_prop}}},

        {"write",                   {2,     2,    {true,   do_write}}},

    };

    // clang-format on