Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Wbitwise-instead-of-logical introduced by clang-r445002" am: 9f165ca3e1 am: 665796dd6d am: bdd7c5eb53

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1961919

Change-Id: Ic3fbab8ee074d96b4d02ee815398e128bca180c8
This commit is contained in:
Pirama Arumuga Nainar
2022-01-28 21:05:30 +00:00
committed by Automerger Merge Worker
parent 576dd5ee58 bdd7c5eb53
commit 138c4fe4bc
1 changed files with 1 additions and 1 deletions
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.
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);