Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6191fc04 authored by Hanna Nizhnikava's avatar Hanna Nizhnikava Committed by Automerger Merge Worker
Browse files

Merge "Remove ableist language" am: af72f11b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1957031

Change-Id: I7f05131b4d94b60e57b414cbc49ad302f14cbde3
parents 77685f19 af72f11b

cmds/installd/dexopt.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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<userid_t> 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<userid_t> users;

    if (is_secondary_dex){

cmds/installd/utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;