Merge changes I5b985fb4,Ic3acc857 into main am: 7aa9524ad2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3341354
Change-Id: Id55ea731952f5d00ed255c5c2eeca5279715fdbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libprocessgroup/profiles/cgroups.json b/libprocessgroup/profiles/cgroups.json
index 3e4393d..dbf736a 100644
--- a/libprocessgroup/profiles/cgroups.json
+++ b/libprocessgroup/profiles/cgroups.json
@@ -20,14 +20,6 @@
"Mode": "0755",
"UID": "system",
"GID": "system"
- },
- {
- "Controller": "memory",
- "Path": "/dev/memcg",
- "Mode": "0700",
- "UID": "root",
- "GID": "system",
- "Optional": true
}
],
"Cgroups2": {
@@ -39,6 +31,13 @@
{
"Controller": "freezer",
"Path": "."
+ },
+ {
+ "Controller": "memory",
+ "Path": ".",
+ "NeedsActivation": true,
+ "MaxActivationDepth": 0,
+ "Optional": true
}
]
}
diff --git a/libprocessgroup/profiles/cgroups.proto b/libprocessgroup/profiles/cgroups.proto
index d2fd472..1a78e9d 100644
--- a/libprocessgroup/profiles/cgroups.proto
+++ b/libprocessgroup/profiles/cgroups.proto
@@ -36,7 +36,7 @@
// https://developers.google.com/protocol-buffers/docs/proto3#default
bool needs_activation = 6 [json_name = "NeedsActivation"];
bool is_optional = 7 [json_name = "Optional"];
- uint32 max_activation_depth = 8 [json_name = "MaxActivationDepth"];
+ optional uint32 max_activation_depth = 8 [json_name = "MaxActivationDepth"];
}
// Next: 6