summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2014-10-31 22:57:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-31 22:57:44 +0000
commitb43a1c9be2046345d61fb0d0a5fd06eda5cbe31e (patch)
tree4c3f0ee2375699a2d5ad20ba73e24836d72e50db /services/surfaceflinger
parent18b846dda798709796be078a7978d885685df9a4 (diff)
parentaffc4d809edbcb3b0e49e5ccc9821b9695a57d44 (diff)
downloadframeworks_native-b43a1c9be2046345d61fb0d0a5fd06eda5cbe31e.zip
frameworks_native-b43a1c9be2046345d61fb0d0a5fd06eda5cbe31e.tar.gz
frameworks_native-b43a1c9be2046345d61fb0d0a5fd06eda5cbe31e.tar.bz2
am affc4d80: Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev
* commit 'affc4d809edbcb3b0e49e5ccc9821b9695a57d44': surfaceflinger: fix -Wunused-parameter warning
Diffstat (limited to 'services/surfaceflinger')
-rw-r--r--services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
index 086ccf8..b767983 100644
--- a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
+++ b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
@@ -68,7 +68,7 @@ FramebufferSurface::FramebufferSurface(HWComposer& hwc, int disp,
mConsumer->setDefaultMaxBufferCount(NUM_FRAMEBUFFER_SURFACE_BUFFERS);
}
-status_t FramebufferSurface::beginFrame(bool mustRecompose) {
+status_t FramebufferSurface::beginFrame(bool /*mustRecompose*/) {
return NO_ERROR;
}