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

Commit b0714585 authored by Marco Ballesio's avatar Marco Ballesio
Browse files

resolve merge conflicts of ff0a789f to rvc-dev-plus-aosp 

Change-Id: I9a335a6036650e47d582fcd4858b57b1a4b7a3bb
parents dd87f9ec ff0a789f

libprocessgroup/profiles/cgroups.json

+13 −11
Original line number Diff line number Diff line
@@ -39,19 +39,21 @@ 
      "Mode": "0755",

      "UID": "system",

      "GID": "system"

    },

    }

  ],

  "Cgroups2": {

    "Path": "/sys/fs/cgroup",

    "Mode": "0755",

    "UID": "system",

    "GID": "system",

    "Controllers": [

      {

        "Controller": "freezer",

      "Path": "/dev/freezer",

        "Path": "freezer",

        "Mode": "0755",

        "UID": "system",

        "GID": "system"

      }

  ],

  "Cgroups2": {

    "Path": "/dev/cg2_bpf",

    "Mode": "0600",

    "UID": "root",

    "GID": "root"

    ]

  }

}

libprocessgroup/profiles/cgroups.proto

+7 −2
Original line number Diff line number Diff line
@@ -24,19 +24,24 @@ message Cgroups { 
    Cgroups2 cgroups2 = 2 [json_name = "Cgroups2"];

}



// Next: 6

// Next: 7

message Cgroup {

    string controller = 1 [json_name = "Controller"];

    string path = 2 [json_name = "Path"];

    string mode = 3 [json_name = "Mode"];

    string uid = 4 [json_name = "UID"];

    string gid = 5 [json_name = "GID"];

// Booleans default to false when not specified. File reconstruction fails

// when a boolean is specified as false, so leave unspecified in that case

// https://developers.google.com/protocol-buffers/docs/proto3#default

    bool needs_activation = 6 [json_name = "NeedsActivation"];

}



// Next: 5

// Next: 6

message Cgroups2 {

    string path = 1 [json_name = "Path"];

    string mode = 2 [json_name = "Mode"];

    string uid = 3 [json_name = "UID"];

    string gid = 4 [json_name = "GID"];

    repeated Cgroup controllers = 5 [json_name = "Controllers"];

}

libprocessgroup/profiles/task_profiles.json

+7 −7
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
    {

      "Name": "FreezerState",

      "Controller": "freezer",

      "File": "frozen/freezer.state"

      "File": "cgroup.freeze"

    }

  ],
@@ -79,7 +79,7 @@ 
          "Params":

          {

            "Controller": "freezer",

            "Path": "frozen"

            "Path": ""

          }

        }

      ]
@@ -92,7 +92,7 @@ 
          "Params":

          {

            "Controller": "freezer",

            "Path": ""

            "Path": "../"

          }

        }

      ]
@@ -538,27 +538,27 @@ 
      ]

    },

    {

      "Name": "FreezerThawed",

      "Name": "FreezerDisabled",

      "Actions": [

        {

          "Name": "SetAttribute",

          "Params":

          {

            "Name": "FreezerState",

            "Value": "THAWED"

            "Value": "0"

          }

        }

      ]

    },

    {

      "Name": "FreezerFrozen",

      "Name": "FreezerEnabled",

      "Actions": [

        {

          "Name": "SetAttribute",

          "Params":

          {

            "Name": "FreezerState",

            "Value": "FROZEN"

            "Value": "1"

          }

        }

      ]

rootdir/init.rc

+0 −12
Original line number Diff line number Diff line
@@ -327,16 +327,6 @@ on init 
    chmod 0664 /dev/cpuset/restricted/tasks

    chmod 0664 /dev/cpuset/tasks



    # freezer cgroup entries

    mkdir /dev/freezer/frozen

    write /dev/freezer/frozen/freezer.state FROZEN

    chown system system /dev/freezer/cgroup.procs

    chown system system /dev/freezer/frozen

    chown system system /dev/freezer/frozen/freezer.state

    chown system system /dev/freezer/frozen/cgroup.procs



    chmod 0664 /dev/freezer/frozen/freezer.state



    # make the PSI monitor accessible to others

    chown system system /proc/pressure/memory

    chmod 0664 /proc/pressure/memory
@@ -351,8 +341,6 @@ on init 
    # This is needed by any process that uses socket tagging.

    chmod 0644 /dev/xt_qtaguid



    chown root root /dev/cg2_bpf

    chmod 0600 /dev/cg2_bpf

    mount bpf bpf /sys/fs/bpf nodev noexec nosuid



    # Create location for fs_mgr to store abbreviated output from filesystem