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

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

Merge "init: Allow matching empty property values" am: 79896d88 am:... 

Merge "init: Allow matching empty property values" am: 79896d88 am: a548cdd7 am: 8be7e808 am: 7bbe1e5f
am: d0e7e74d

Change-Id: I315092965fe23c6c8ffce0f4c5bd2640ab89cd75
parents 9229a3e3 d0e7e74d

init/action.cpp

+4 −3
Original line number Diff line number Diff line
@@ -195,10 +195,11 @@ bool Action::CheckPropertyTriggers(const std::string& name, 
                found = true;

            }

        } else {

            std::string prop_val = android::base::GetProperty(trigger_name, "");

            if (prop_val.empty() || (trigger_value != "*" && trigger_value != prop_val)) {

                return false;

            std::string prop_value = android::base::GetProperty(trigger_name, "");

            if (trigger_value == "*" && !prop_value.empty()) {

                continue;

            }

            if (trigger_value != prop_value) return false;

        }

    }

    return found;