summaryrefslogtreecommitdiff
path: root/cmds/installd/utils.cpp
diff options
context:
space:
mode:
author Calin Juravle <calin@google.com> 2017-03-11 01:00:07 +0000
committer android-build-merger <android-build-merger@google.com> 2017-03-11 01:00:07 +0000
commit0045d606d1595aa5665e92060ce508ed0f54d12c (patch)
tree05fcbffc58f28229092b6adea9285fa67257d6b6 /cmds/installd/utils.cpp
parent0c90e1c416ca5e6b24e00955ccde23705790e226 (diff)
parentccaa1f3f78e7f0891877153f3d5c07bfd596b084 (diff)
Merge "Use std::string for profile operations instead of const char" am: 7c7d888d94
am: ccaa1f3f78 Change-Id: If09e67000ca5818c27bbfe521554c22209c0d04f
Diffstat (limited to 'cmds/installd/utils.cpp')
-rw-r--r--cmds/installd/utils.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/cmds/installd/utils.cpp b/cmds/installd/utils.cpp
index c59f4816e7..a6fa6561c9 100644
--- a/cmds/installd/utils.cpp
+++ b/cmds/installd/utils.cpp
@@ -217,18 +217,18 @@ std::string create_data_user_profile_path(userid_t userid) {
return StringPrintf("%s/cur/%u", android_profiles_dir.path, userid);
}
-std::string create_data_user_profile_package_path(userid_t user, const char* package_name) {
- check_package_name(package_name);
- return StringPrintf("%s/%s",create_data_user_profile_path(user).c_str(), package_name);
+std::string create_data_user_profile_package_path(userid_t user, const std::string& package_name) {
+ check_package_name(package_name.c_str());
+ return StringPrintf("%s/%s",create_data_user_profile_path(user).c_str(), package_name.c_str());
}
std::string create_data_ref_profile_path() {
return StringPrintf("%s/ref", android_profiles_dir.path);
}
-std::string create_data_ref_profile_package_path(const char* package_name) {
- check_package_name(package_name);
- return StringPrintf("%s/ref/%s", android_profiles_dir.path, package_name);
+std::string create_data_ref_profile_package_path(const std::string& package_name) {
+ check_package_name(package_name.c_str());
+ return StringPrintf("%s/ref/%s", android_profiles_dir.path, package_name.c_str());
}
std::string create_data_dalvik_cache_path() {