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

Merge "init: move empty string check to InitTriggers"

Browse source
This commit is contained in:
Wei Wang 2016-11-17 19:21:47 +00:00 • committed by Gerrit Code Review
commit 9bf10ff61e
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
init/action.cpp
View file

@ -157,6 +157,11 @@ bool Action::ParsePropertyTrigger(const std::string& trigger, std::string* err)
bool Action::InitTriggers(const std::vector<std::string>& args, std::string* err) { bool Action::InitTriggers(const std::vector<std::string>& args, std::string* err) {
const static std::string prop_str("property:"); const static std::string prop_str("property:");
for (std::size_t i = 0; i < args.size(); ++i) { for (std::size_t i = 0; i < args.size(); ++i) {
if (args[i].empty()) {
*err = "empty trigger is not valid";
return false;
}
if (i % 2) { if (i % 2) {
if (args[i] != "&&") { if (args[i] != "&&") {
*err = "&& is the only symbol allowed to concatenate actions"; *err = "&& is the only symbol allowed to concatenate actions";
@ -186,7 +191,11 @@ bool Action::InitTriggers(const std::vector<std::string>& args, std::string* err
bool Action::InitSingleTrigger(const std::string& trigger) { bool Action::InitSingleTrigger(const std::string& trigger) {
std::vector<std::string> name_vector{trigger}; std::vector<std::string> name_vector{trigger};
std::string err; std::string err;
return InitTriggers(name_vector, &err); bool ret = InitTriggers(name_vector, &err);
if (!ret) {
LOG(ERROR) << "InitSingleTrigger failed due to: " << err;
}
return ret;
} }
// This function checks that all property triggers are satisfied, that is // This function checks that all property triggers are satisfied, that is
@ -252,9 +261,7 @@ std::string Action::BuildTriggersString() const {
result += event_trigger_; result += event_trigger_;
result += ' '; result += ' ';
} }
if (!result.empty()) { result.pop_back();
result.pop_back();
}
return result; return result;
} }