commit b5236fbff59fd2327e43afa81242ae46983b3c6b
author Tom Cherry <tomcherry@google.com> Mon Aug 12 22:35:31 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 12 22:35:31 2019 +0000
tree a5d21f7b1f715d24a2250cc8637065de2659a1d1
parent c09d8a8fb84d8a340eda843d66f58daf13ed3f64
parent 4d5074e9d6c8e77dc2234f0c63b7847c60170058

Merge "init: Allow matching empty property values"

init/action.cpp

diff --git a/init/action.cpp b/init/action.cpp
index 1a66eee..69e40d0 100644
--- a/init/action.cpp
+++ b/init/action.cpp
@@ -195,10 +195,11 @@
                 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;