ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: cadc34fd9a

Change-Id: I8e49ea0cec37f6abe8e5e31fb1adb83d696d969b
This commit is contained in:
Tom Cherry 2017-10-19 00:16:25 +00:00 • committed by android-build-merger
commit fe08631fe8
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
init/builtins.cpp
View file

@ -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