am d2738ead: Merge "Frameworks/base: Unused parameters in hwui"

* commit 'd2738eadc1f8c92c64d47429ef3f168738431809':
  Frameworks/base: Unused parameters in hwui

3 files changed, 9 insertions, 7 deletions

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index b50a433..ab6588a 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -115,13 +115,13 @@ void CanvasContext::updateSurface(ANativeWindow* window) {
     setSurface(window);
 }
 
-void CanvasContext::pauseSurface(ANativeWindow* window) {
+void CanvasContext::pauseSurface(ANativeWindow* /* window */) {
     stopDrawing();
 }
 
 // TODO: don't pass viewport size, it's automatic via EGL
-void CanvasContext::setup(int width, int height, const Vector3& lightCenter, float lightRadius,
-        uint8_t ambientShadowAlpha, uint8_t spotShadowAlpha) {
+void CanvasContext::setup(int /* width */, int /* height */, const Vector3& lightCenter,
+        float lightRadius, uint8_t ambientShadowAlpha, uint8_t spotShadowAlpha) {
     if (!mCanvas) return;
     mCanvas->initLight(lightCenter, lightRadius, ambientShadowAlpha, spotShadowAlpha);
 }
diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp
index c6ea82b..8fd39cd 100644
--- a/libs/hwui/renderthread/RenderProxy.cpp
+++ b/libs/hwui/renderthread/RenderProxy.cpp
@@ -344,14 +344,16 @@ void RenderProxy::trimMemory(int level) {
     }
 }
 
+template <typename T>
+void UNUSED(T) {}
+
+
 CREATE_BRIDGE0(fence) {
     // Intentionally empty
+    UNUSED(args);
     return NULL;
 }
 
-template <typename T>
-void UNUSED(T t) {}
-
 void RenderProxy::fence() {
     SETUP_TASK(fence);
     UNUSED(args);
diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp
index 403e164..1be4a97 100644
--- a/libs/hwui/renderthread/RenderThread.cpp
+++ b/libs/hwui/renderthread/RenderThread.cpp
@@ -171,7 +171,7 @@ void RenderThread::initThreadLocals() {
     mRenderState = new RenderState();
 }
 
-int RenderThread::displayEventReceiverCallback(int fd, int events, void* data) {
+int RenderThread::displayEventReceiverCallback(int /* fd */, int events, void* data) {
     if (events & (Looper::EVENT_ERROR | Looper::EVENT_HANGUP)) {
         ALOGE("Display event receiver pipe was closed or an error occurred.  "
                 "events=0x%x", events);