From c109b13b5a72f9dd357864f7fe5748c81b4f2310 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 12 Apr 2022 19:48:04 +0000 Subject: [PATCH] Revert "libprocessgroup: return false on failure" This reverts commit 9818f95c9e6ec2e058ab4ae6ed0d1ffdd8eb94fe. Reason for revert: broke some tests. b/228910109 Change-Id: I2d5f837969e433b765de89d899fc172ceeef27a6 --- libprocessgroup/task_profiles.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libprocessgroup/task_profiles.cpp b/libprocessgroup/task_profiles.cpp index e1c593407..27060aed5 100644 --- a/libprocessgroup/task_profiles.cpp +++ b/libprocessgroup/task_profiles.cpp @@ -806,7 +806,6 @@ const IProfileAttribute* TaskProfiles::GetAttribute(const std::string& name) con bool TaskProfiles::SetProcessProfiles(uid_t uid, pid_t pid, const std::vector& profiles, bool use_fd_cache) { - bool success = true; for (const auto& name : profiles) { TaskProfile* profile = GetProfile(name); if (profile != nullptr) { @@ -815,19 +814,16 @@ bool TaskProfiles::SetProcessProfiles(uid_t uid, pid_t pid, } if (!profile->ExecuteForProcess(uid, pid)) { PLOG(WARNING) << "Failed to apply " << name << " process profile"; - success = false; } } else { - PLOG(WARNING) << "Failed to find " << name << " process profile"; - success = false; + PLOG(WARNING) << "Failed to find " << name << "process profile"; } } - return success; + return true; } bool TaskProfiles::SetTaskProfiles(int tid, const std::vector& profiles, bool use_fd_cache) { - bool success = true; for (const auto& name : profiles) { TaskProfile* profile = GetProfile(name); if (profile != nullptr) { @@ -836,12 +832,10 @@ bool TaskProfiles::SetTaskProfiles(int tid, const std::vector& prof } if (!profile->ExecuteForTask(tid)) { PLOG(WARNING) << "Failed to apply " << name << " task profile"; - success = false; } } else { - PLOG(WARNING) << "Failed to find " << name << " task profile"; - success = false; + PLOG(WARNING) << "Failed to find " << name << "task profile"; } } - return success; + return true; }