diff options
| author | 2022-01-28 21:05:30 +0000 | |
|---|---|---|
| committer | 2022-01-28 21:05:30 +0000 | |
| commit | 138c4fe4bc98abc8f7817b92353ef8a101b35db7 (patch) | |
| tree | 472c726e4f7f7c36b1a9bba8b094156da423910e | |
| parent | 576dd5ee58548dbc2e903c104e61e18e75f7ef7d (diff) | |
| parent | bdd7c5eb53ae0dc32c3e074367a761d3562b95a2 (diff) | |
Merge "Fix Wbitwise-instead-of-logical introduced by clang-r445002" am: 9f165ca3e1 am: 665796dd6d am: bdd7c5eb53
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1961919
Change-Id: Ic3fbab8ee074d96b4d02ee815398e128bca180c8
| -rw-r--r-- | cmds/incidentd/src/WorkDirectory.cpp | 2 |
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); |