From 76268c56febde9a77183387fbd4baabe6694e6b5 Mon Sep 17 00:00:00 2001 From: Calin Juravle Date: Thu, 9 Mar 2017 13:19:42 -0800 Subject: Use std::string for profile operations instead of const char Will make things cleaner when adding secondary dex profile support. Also, add tests to verify profile path creation. Bug: 26719109 Test: /data/nativetest64/installd_utils_test/installd_utils_test Change-Id: I8cb1a11cefee21f5001d2b729110696d52fc8323 --- cmds/installd/utils.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cmds/installd/utils.cpp') 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() { -- cgit v1.2.3-59-g8ed1b