summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Aditya Kumar <appujee@google.com> 2024-09-26 20:44:18 +0000
committer Aditya Kumar <appujee@google.com> 2024-10-02 15:56:26 +0000
commit4648b7e8b5fd81580c81ad3a24e13b26ea9c12d2 (patch)
tree05351ae9821da92c3a9010849bda66802710b11c
parent537f9e50512a3428f9c318c3fa7ffefc26c8e31f (diff)
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
-rw-r--r--services/surfaceflinger/Display/DisplayModeController.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/surfaceflinger/Display/DisplayModeController.cpp b/services/surfaceflinger/Display/DisplayModeController.cpp
index 0e9218cb93..f8b6c6e5d5 100644
--- a/services/surfaceflinger/Display/DisplayModeController.cpp
+++ b/services/surfaceflinger/Display/DisplayModeController.cpp
@@ -283,6 +283,8 @@ void DisplayModeController::updateKernelIdleTimer(PhysicalDisplayId displayId,
}
}
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-value" // b/369277774
auto DisplayModeController::getKernelIdleTimerState(PhysicalDisplayId displayId) const
-> KernelIdleTimerState {
std::lock_guard lock(mDisplayLock);
@@ -298,4 +300,5 @@ auto DisplayModeController::getKernelIdleTimerState(PhysicalDisplayId displayId)
return {desiredModeIdOpt, displayPtr->isKernelIdleTimerEnabled};
}
+#pragma clang diagnostic pop
} // namespace android::display