Skip to content

Commit 91b33f1

Browse files
committed
Disable -Wunused-value for surfaceflinger
``` out/soong/.intermediates/frameworks/native/services/surfaceflinger/Tracing/tools/layertracegenerator/android_x86_64_silvermont/obj/frameworks/native/services/surfaceflinger/Scheduler/Scheduler.o frameworks/native/services/surfaceflinger/Scheduler/Scheduler.cpp frameworks/native/services/surfaceflinger/Scheduler/Scheduler.cpp:432:29: error: ignoring temporary created by a constructor declared with 'nodiscard' attribute [-Werror,-Wunused-value] 432 | (std::scoped_lock(mDisplayLock), displayId == mPacesetterDisplayId)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` Flag: EXEMPT b/369277774 Bug: b/369277774 Change-Id: Idd45525cc3fe15c3b5e66332650ce8b7811ae026
1 parent 6a3c7c9 commit 91b33f1

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
@@ -426,6 +426,8 @@ void Scheduler::onHdcpLevelsChanged(Cycle cycle, PhysicalDisplayId displayId,
426426
eventThreadFor(cycle).onHdcpLevelsChanged(displayId, connectedLevel, maxLevel);
427427
}
428428

429+
#pragma clang diagnostic push
430+
#pragma clang diagnostic ignored "-Wunused-value" // b/369277774
429431
bool Scheduler::onDisplayModeChanged(PhysicalDisplayId displayId, const FrameRateMode& mode) {
430432
const bool isPacesetter =
431433
FTL_FAKE_GUARD(kMainThreadContext,
@@ -446,6 +448,7 @@ bool Scheduler::onDisplayModeChanged(PhysicalDisplayId displayId, const FrameRat
446448

447449
return isPacesetter;
448450
}
451+
#pragma clang diagnostic pop
449452

450453
void Scheduler::emitModeChangeIfNeeded() {
451454
if (!mPolicy.modeOpt || !mPolicy.emittedModeOpt) {

0 commit comments

Comments
 (0)