Skip to content

Commit 95fd424

Browse files
committed
Disable -Wunused-value for surfaceflinger
``` frameworks/native/services/surfaceflinger/Display/DisplayModeController.cpp:293:14: error: ignoring temporary created by a constructor declared with 'nodiscard' attribute [-Werror,-Wunused-value] 293 | (std::scoped_lock(displayPtr->desiredModeLock), displayPtr->desiredModeOpt) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` Change-Id: I5e84dbd628f5c03f5e325f5ccc5d365d2f40c9dd Flag: EXEMPT b/369277774 Bug: b/369277774 (cherry picked from commit 4648b7e)
1 parent 37f5490 commit 95fd424

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

services/surfaceflinger/Display/DisplayModeController.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,8 @@ void DisplayModeController::updateKernelIdleTimer(PhysicalDisplayId displayId,
283283
}
284284
}
285285

286+
#pragma clang diagnostic push
287+
#pragma clang diagnostic ignored "-Wunused-value" // b/369277774
286288
auto DisplayModeController::getKernelIdleTimerState(PhysicalDisplayId displayId) const
287289
-> KernelIdleTimerState {
288290
std::lock_guard lock(mDisplayLock);
@@ -298,4 +300,5 @@ auto DisplayModeController::getKernelIdleTimerState(PhysicalDisplayId displayId)
298300
return {desiredModeIdOpt, displayPtr->isKernelIdleTimerEnabled};
299301
}
300302

303+
#pragma clang diagnostic pop
301304
} // namespace android::display

0 commit comments

Comments
 (0)