commit 4d8779fc5b0f371b413a605e10c6efb0aa25036c
author Michael Wright <michaelwr@google.com> Wed Oct 16 14:01:50 2013 -0700
committer Michael Wright <michaelwr@google.com> Wed Oct 16 14:01:50 2013 -0700
tree d7a4acb79d61575720d6abd4d0984181085cc6f4
parent 805f7a1d0140c2ad9ad214e5329e1a6a26fb5134

Disable unused parameter warning for libinput

Also, avoid comparing values of mixed signedness.

Change-Id: I9804f69c29fcb1d0a9fe4b833ef1a569738c99fd

services/input/Android.mk

diff --git a/services/input/Android.mk b/services/input/Android.mk
index 6e944ef..eb2bebe 100644
--- a/services/input/Android.mk
+++ b/services/input/Android.mk
@@ -42,6 +42,8 @@
 LOCAL_C_INCLUDES := \
     external/skia/include/core
 
+LOCAL_CFLAGS += -Wno-unused-parameter
+
 LOCAL_MODULE:= libinputservice
 
 LOCAL_MODULE_TAGS := optional

services/input/SpriteController.cpp

diff --git a/services/input/SpriteController.cpp b/services/input/SpriteController.cpp
index fd9c66b..2667a72 100644
--- a/services/input/SpriteController.cpp
+++ b/services/input/SpriteController.cpp
@@ -216,12 +216,12 @@
                 paint.setXfermodeMode(SkXfermode::kSrc_Mode);
                 surfaceCanvas.drawBitmap(update.state.icon.bitmap, 0, 0, &paint);
 
-                if (outBuffer.width > uint32_t(update.state.icon.bitmap.width())) {
+                if (outBuffer.width > update.state.icon.bitmap.width()) {
                     paint.setColor(0); // transparent fill color
                     surfaceCanvas.drawRectCoords(update.state.icon.bitmap.width(), 0,
                             outBuffer.width, update.state.icon.bitmap.height(), paint);
                 }
-                if (outBuffer.height > uint32_t(update.state.icon.bitmap.height())) {
+                if (outBuffer.height > update.state.icon.bitmap.height()) {
                     paint.setColor(0); // transparent fill color
                     surfaceCanvas.drawRectCoords(0, update.state.icon.bitmap.height(),
                             outBuffer.width, outBuffer.height, paint);