diff options
| author | 2022-01-28 20:50:28 +0000 | |
|---|---|---|
| committer | 2022-01-28 20:50:28 +0000 | |
| commit | bdd7c5eb53ae0dc32c3e074367a761d3562b95a2 (patch) | |
| tree | 3d57ac2585e80c497ae898088b4ff05ba89afce2 | |
| parent | dcf68aea2884cce5c696512c78141da3354ef037 (diff) | |
| parent | 665796dd6dfbbdaa38335b13c33137d6ffbfa10c (diff) | |
Merge "Fix Wbitwise-instead-of-logical introduced by clang-r445002" am: 9f165ca3e1 am: 665796dd6d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1961919
Change-Id: I6640db34b9ed6f3a4c64e0eb718c0eb0c725113e
| -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); |