Skip to content

Commit c23f12c

Browse files
appujeeAndroid (Google) Code Review
authored andcommitted
Merge "Disable warning: ignoring temporary created by a constructor declared with 'nodiscard' attribute" into main
2 parents f436c47 + 860ef88 commit c23f12c

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

services/surfaceflinger/Scheduler/Scheduler.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -915,6 +915,8 @@ void Scheduler::dumpVsync(std::string& out) const {
915915
}
916916
}
917917

918+
#pragma clang diagnostic push
919+
#pragma clang diagnostic ignored "-Wunused-value" // b/369277774
918920
void Scheduler::updateFrameRateOverrides(GlobalSignals consideredSignals, Fps displayRefreshRate) {
919921
const bool changed = (std::scoped_lock(mPolicyLock),
920922
updateFrameRateOverridesLocked(consideredSignals, displayRefreshRate));
@@ -923,6 +925,7 @@ void Scheduler::updateFrameRateOverrides(GlobalSignals consideredSignals, Fps di
923925
onFrameRateOverridesChanged();
924926
}
925927
}
928+
#pragma clang diagnostic pop
926929

927930
bool Scheduler::updateFrameRateOverridesLocked(GlobalSignals consideredSignals,
928931
Fps displayRefreshRate) {

0 commit comments

Comments
 (0)