summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Pirama Arumuga Nainar <pirama@google.com> 2022-01-21 14:16:03 -0800
committer Pirama Arumuga Nainar <pirama@google.com> 2022-01-21 14:16:03 -0800
commitbf3cc242fca09ed08e3ecb13676654de02238a75 (patch)
tree40b6f255297fe0b85ef3d5fd9f504775942b008b
parent20b5b3c15743ca5c6f45afb67f9a5b33fd52aa8e (diff)
Fix Wbitwise-instead-of-logical introduced by clang-r445002
Bug: http://b/215753485 frameworks/base/cmds/incidentd/src/WorkDirectory.cpp:283:38: error: use of bitwise '|' with boolean operands [-Werror,-Wbitwise-instead-of-logical] report->set_all_sections(report->all_sections() | args.all()); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ || frameworks/base/cmds/incidentd/src/WorkDirectory.cpp:283:38: note: cast one or both operands to int to silence this warning Test: Build with new clang Change-Id: I8dc614e274c95f8941bf390cb68c60d0328bb31b
-rw-r--r--cmds/incidentd/src/WorkDirectory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/incidentd/src/WorkDirectory.cpp b/cmds/incidentd/src/WorkDirectory.cpp
index 23d80d7953b7..0d8bd40a4de1 100644
--- a/cmds/incidentd/src/WorkDirectory.cpp
+++ b/cmds/incidentd/src/WorkDirectory.cpp
@@ -280,7 +280,7 @@ void ReportFile::addReport(const IncidentReportArgs& args) {
// Lower privacy policy (less restrictive) wins.
report->set_privacy_policy(args.getPrivacyPolicy());
}
- report->set_all_sections(report->all_sections() | args.all());
+ report->set_all_sections(report->all_sections() || args.all());
for (int section: args.sections()) {
if (!has_section(*report, section)) {
report->add_section(section);