diff options
| author | Rick Yiu <rickyiu@google.com> | 2021-04-10 03:49:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-10 03:49:10 +0000 |
| commit | ca605c292ade4fe8302ff23bfca5624ce947285c (patch) | |
| tree | 4a2bd5cc8728527abbb0c37425bcae7c01b10a4f | |
| parent | 8dd2ea72df675bafad4a2bf217618a5bfef89f9f (diff) | |
| parent | 4a22ef2716283ccb1aa0d4a5d2011f56fd28938a (diff) | |
Merge "libprocessgroup: Change LogFailures to string" am: 32c68d4e33 am: 4a22ef2716
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1669611
Change-Id: I7578b23ee9988087438d417903947b03409aa056
| -rw-r--r-- | libprocessgroup/task_profiles.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libprocessgroup/task_profiles.cpp b/libprocessgroup/task_profiles.cpp index f13a6815c..db00a4981 100644 --- a/libprocessgroup/task_profiles.cpp +++ b/libprocessgroup/task_profiles.cpp @@ -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"; |