summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2019-08-21 10:27:17 -0700
committer android-build-merger <android-build-merger@google.com> 2019-08-21 10:27:17 -0700
commite13b69f2b098a7de792fde0c51b976b3a0d43c69 (patch)
tree72faab92be227f7918e8100e36d3760a1b91c507
parent50fad5c094debf87916b1d57883ac611f74486f5 (diff)
parent934b524b9558c70dff13c8974d718fb270fabf53 (diff)
Merge "servicemanager: Allow '/' character in service names." into stage-aosp-master am: 053019df21 am: 3ce418e1b5
am: 934b524b95 Change-Id: I58dcd8ddf3a8d7f8aa8cdbc4486b45fb7dc9e794
-rw-r--r--cmds/servicemanager/ServiceManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/servicemanager/ServiceManager.cpp b/cmds/servicemanager/ServiceManager.cpp
index f35f360dec..4d5c76ab95 100644
--- a/cmds/servicemanager/ServiceManager.cpp
+++ b/cmds/servicemanager/ServiceManager.cpp
@@ -67,7 +67,7 @@ bool isValidServiceName(const std::string& name) {
if (name.size() > 127) return false;
for (char c : name) {
- if (c == '_' || c == '-' || c == '.') continue;
+ if (c == '_' || c == '-' || c == '.' || c == '/') continue;
if (c >= 'a' && c <= 'z') continue;
if (c >= 'A' && c <= 'Z') continue;
if (c >= '0' && c <= '9') continue;