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

Commit 1ccd01fe authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Ic8b33ce8,Ied6f13e5 

* changes:
  installd: Avoid extra std::string copy
  dexopt: Avoid a couple std::string copies
parents c10e80f5 6d758fc4

cmds/installd/InstalldNativeService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ binder::Status checkArgumentUuidTestOrNull(const std::unique_ptr<std::string>& u 
}



binder::Status checkArgumentPackageName(const std::string& packageName) {

    if (is_valid_package_name(packageName.c_str())) {

    if (is_valid_package_name(packageName)) {

        return ok();

    } else {

        return exception(binder::Status::EX_ILLEGAL_ARGUMENT,

cmds/installd/dexopt.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1564,7 +1564,7 @@ class RunDexoptAnalyzer : public ExecVHelper { 
        if (vdex_fd >= 0) {

            AddArg(vdex_fd_arg);

        }

        AddArg(zip_fd_arg.c_str());

        AddArg(zip_fd_arg);

        if (profile_was_updated) {

            AddArg(assume_profile_changed);

        }
@@ -1572,9 +1572,9 @@ class RunDexoptAnalyzer : public ExecVHelper { 
            AddArg(downgrade_flag);

        }

        if (class_loader_context != nullptr) {

            AddArg(class_loader_context_arg.c_str());

            AddArg(class_loader_context_arg);

            if (!class_loader_context_fds.empty()) {

                AddArg(class_loader_context_fds_arg.c_str());

                AddArg(class_loader_context_fds_arg);

            }

        }
@@ -2259,7 +2259,7 @@ bool reconcile_secondary_dex_file(const std::string& dex_path, 
        drop_capabilities(uid);



        const char* volume_uuid_cstr = volume_uuid == nullptr ? nullptr : volume_uuid->c_str();

        if (!validate_secondary_dex_path(pkgname.c_str(), dex_path.c_str(), volume_uuid_cstr,

        if (!validate_secondary_dex_path(pkgname, dex_path, volume_uuid_cstr,

                uid, storage_flag)) {

            LOG(ERROR) << "Could not validate secondary dex path " << dex_path;

            _exit(kReconcileSecondaryDexValidationError);