diff options
| -rw-r--r-- | cmds/installd/InstalldNativeService.cpp | 2 | ||||
| -rw-r--r-- | cmds/installd/dexopt.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp index 92fac66d67..c730ab945c 100644 --- a/cmds/installd/InstalldNativeService.cpp +++ b/cmds/installd/InstalldNativeService.cpp @@ -171,7 +171,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, diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp index 20142aab3b..a5cc0df77e 100644 --- a/cmds/installd/dexopt.cpp +++ b/cmds/installd/dexopt.cpp @@ -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); |