Merge "libprocessgroup: Introduce a local variable in CgroupMap::ActivateControllers()" am: d9098252c6 am: 79b8448729

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2424611

Change-Id: I36bdc8f45cb44b59102e12a80b92a2e0c95ec844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bart Van Assche 2023-02-09 22:21:05 +00:00 committed by Automerger Merge Worker
commit f4c72869d9

View file

@ -229,8 +229,8 @@ int CgroupMap::ActivateControllers(const std::string& path) const {
auto controller_count = ACgroupFile_getControllerCount();
for (uint32_t i = 0; i < controller_count; ++i) {
const ACgroupController* controller = ACgroupFile_getController(i);
if (ACgroupController_getFlags(controller) &
CGROUPRC_CONTROLLER_FLAG_NEEDS_ACTIVATION) {
const uint32_t flags = ACgroupController_getFlags(controller);
if (flags & CGROUPRC_CONTROLLER_FLAG_NEEDS_ACTIVATION) {
std::string str("+");
str.append(ACgroupController_getName(controller));
if (!WriteStringToFile(str, path + "/cgroup.subtree_control")) {