Merge "Disable -Wunused-value for surfaceflinger" into main

appujee · Android (Google) Code Review · commit 12fb1d2c6368 · 2024-10-10T16:36:13.000Z
diff --git a/services/surfaceflinger/Scheduler/Scheduler.cpp b/services/surfaceflinger/Scheduler/Scheduler.cpp
@@ -426,6 +426,8 @@ void Scheduler::onHdcpLevelsChanged(Cycle cycle, PhysicalDisplayId displayId,
     eventThreadFor(cycle).onHdcpLevelsChanged(displayId, connectedLevel, maxLevel);
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-value" // b/369277774
 bool Scheduler::onDisplayModeChanged(PhysicalDisplayId displayId, const FrameRateMode& mode) {
     const bool isPacesetter =
             FTL_FAKE_GUARD(kMainThreadContext,
@@ -446,6 +448,7 @@ bool Scheduler::onDisplayModeChanged(PhysicalDisplayId displayId, const FrameRat
 
     return isPacesetter;
 }
+#pragma clang diagnostic pop
 
 void Scheduler::emitModeChangeIfNeeded() {
     if (!mPolicy.modeOpt || !mPolicy.emittedModeOpt) {

Original file line number	Diff line number	Diff line change
`@@ -426,6 +426,8 @@ void Scheduler::onHdcpLevelsChanged(Cycle cycle, PhysicalDisplayId displayId,`
`426`	`426`	`eventThreadFor(cycle).onHdcpLevelsChanged(displayId, connectedLevel, maxLevel);`
`427`	`427`	`}`
`428`	`428`
	`429`	`+#pragma clang diagnostic push`
	`430`	`+#pragma clang diagnostic ignored "-Wunused-value" // b/369277774`
`429`	`431`	`bool Scheduler::onDisplayModeChanged(PhysicalDisplayId displayId, const FrameRateMode& mode) {`
`430`	`432`	`const bool isPacesetter =`
`431`	`433`	`FTL_FAKE_GUARD(kMainThreadContext,`
`@@ -446,6 +448,7 @@ bool Scheduler::onDisplayModeChanged(PhysicalDisplayId displayId, const FrameRat`
`446`	`448`
`447`	`449`	`return isPacesetter;`
`448`	`450`	`}`
	`451`	`+#pragma clang diagnostic pop`
`449`	`452`
`450`	`453`	`void Scheduler::emitModeChangeIfNeeded() {`
`451`	`454`	`if (!mPolicy.modeOpt \|\| !mPolicy.emittedModeOpt) {`