From b35b872d68e248595ddfda9b0757b86ee01c0732 Mon Sep 17 00:00:00 2001 From: Hanna Nizhnikava Date: Fri, 21 Jan 2022 16:59:56 +0000 Subject: Remove ableist language Bug: 215092166 Test: manual test Change-Id: I616bfa4994b2b20c8545834d7d746987baef9ca1 --- cmds/installd/dexopt.cpp | 4 ++-- cmds/installd/utils.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp index b6f42ad172..c796da6c46 100644 --- a/cmds/installd/dexopt.cpp +++ b/cmds/installd/dexopt.cpp @@ -244,7 +244,7 @@ bool clear_primary_reference_profile(const std::string& package_name, // The location is the profile name for primary apks or the dex path for secondary dex files. bool clear_primary_current_profiles(const std::string& package_name, const std::string& location) { bool success = true; - // For secondary dex files, we don't really need the user but we use it for sanity checks. + // For secondary dex files, we don't really need the user but we use it for validity checks. std::vector users = get_known_users(/*volume_uuid*/ nullptr); for (auto user : users) { success &= clear_current_profile(package_name, location, user, /*is_secondary_dex*/false); @@ -468,7 +468,7 @@ static void open_profile_files(uid_t uid, const std::string& package_name, *reference_profile_fd = open_reference_profile(uid, package_name, location, /*read_write*/ true, is_secondary_dex); - // For secondary dex files, we don't really need the user but we use it for sanity checks. + // For secondary dex files, we don't really need the user but we use it for validity checks. // Note: the user owning the dex file should be the current user. std::vector users; if (is_secondary_dex){ diff --git a/cmds/installd/utils.cpp b/cmds/installd/utils.cpp index c4ecd070c1..0f8a732345 100644 --- a/cmds/installd/utils.cpp +++ b/cmds/installd/utils.cpp @@ -829,7 +829,7 @@ void remove_path_xattr(const std::string& path, const char* inode_xattr) { * to top level directories (i.e. have ".."). */ static int validate_path(const std::string& dir, const std::string& path, int maxSubdirs) { - // Argument sanity checking + // Argument check if (dir.find('/') != 0 || dir.rfind('/') != dir.size() - 1 || dir.find("..") != std::string::npos) { LOG(ERROR) << "Invalid directory " << dir; -- cgit v1.2.3-59-g8ed1b