drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Wbitwise-instead-of-logical introduced by clang-r445002

Browse Source 
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
This commit is contained in:
Pirama Arumuga Nainar 2022-01-21 14:16:03 -08:00
parent 20b5b3c157
commit bf3cc242fc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/incidentd/src/WorkDirectory.cpp
View File

@ -280,7 +280,7 @@ void ReportFile::addReport(const IncidentReportArgs& args) {
// Lower privacy policy (less restrictive) wins. // Lower privacy policy (less restrictive) wins.
report->set_privacy_policy(args.getPrivacyPolicy()); 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()) { for (int section: args.sections()) {
if (!has_section(*report, section)) { if (!has_section(*report, section)) {
report->add_section(section); report->add_section(section);