From bf3cc242fca09ed08e3ecb13676654de02238a75 Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Fri, 21 Jan 2022 14:16:03 -0800 Subject: [PATCH] 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 --- cmds/incidentd/src/WorkDirectory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);