Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c563315 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I5b985fb4,Ic3acc857 into main am: 7aa9524a 

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



Change-Id: Id55ea731952f5d00ed255c5c2eeca5279715fdbc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 062fea20 7aa9524a

libprocessgroup/profiles/cgroups.json

+7 −8
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ message Cgroup { 
// 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