commit 7aa9524ad26058fb15efa3a134c90cfe1851197d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Dec 12 10:00:54 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 12 10:00:54 2024 -0800
tree bbc5fdd59994a8ab30bb9081bb1d6709249dd781
parent 062fea2017354b924399bfb5e05242bc8e4ab7a5
parent 5fa48a84b53aa60d76ba85dd449d470128b48742

Merge changes I5b985fb4,Ic3acc857 into main

* changes:
  libprocessgroup: memcg default version 1 -> 2
  libprocessgroup: Explicit field presence for MaxActivationDepth

libprocessgroup/profiles/cgroups.json

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
       }
     ]
   }

libprocessgroup/profiles/cgroups.proto

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