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

Commit f5349a49 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7273999 from 385160e9 to sc-v2-release

Change-Id: Ia8008ca61627a181cc82c599426a37f3ba1d3338
parents 62a04059 385160e9
Loading
Loading
Loading
Loading
+6 −32
Original line number Diff line number Diff line
@@ -70,11 +70,11 @@
      "Name": "Frozen",
      "Actions": [
        {
          "Name": "JoinCgroup",
          "Name": "SetAttribute",
          "Params":
          {
            "Controller": "freezer",
            "Path": ""
            "Name": "FreezerState",
            "Value": "1"
          }
        }
      ]
@@ -83,11 +83,11 @@
      "Name": "Unfrozen",
      "Actions": [
        {
          "Name": "JoinCgroup",
          "Name": "SetAttribute",
          "Params":
          {
            "Controller": "freezer",
            "Path": "../"
            "Name": "FreezerState",
            "Value": "0"
          }
        }
      ]
@@ -558,32 +558,6 @@
        }
      ]
    },
    {
      "Name": "FreezerDisabled",
      "Actions": [
        {
          "Name": "SetAttribute",
          "Params":
          {
            "Name": "FreezerState",
            "Value": "0"
          }
        }
      ]
    },
    {
      "Name": "FreezerEnabled",
      "Actions": [
        {
          "Name": "SetAttribute",
          "Params":
          {
            "Name": "FreezerState",
            "Value": "1"
          }
        }
      ]
    }
  ],

  "AggregateProfiles": [
+3 −3
Original line number Diff line number Diff line
@@ -518,10 +518,10 @@ bool TaskProfiles::Load(const CgroupMap& cg_map, const std::string& file_name) {
                std::string attr_filepath = params_val["FilePath"].asString();
                std::string attr_value = params_val["Value"].asString();
                if (!attr_filepath.empty() && !attr_value.empty()) {
                    const Json::Value& logfailures = params_val["LogFailures"];
                    bool attr_logfailures = logfailures.isNull() || logfailures.asBool();
                    std::string attr_logfailures = params_val["LogFailures"].asString();
                    bool logfailures = attr_logfailures.empty() || attr_logfailures == "true";
                    profile->Add(std::make_unique<WriteFileAction>(attr_filepath, attr_value,
                                                                   attr_logfailures));
                                                                   logfailures));
                } else if (attr_filepath.empty()) {
                    LOG(WARNING) << "WriteFile: invalid parameter: "
                                 << "empty filepath";