Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable unused parameter warning for libinput

Browse Source 
Also, avoid comparing values of mixed signedness.

Change-Id: I9804f69c29fcb1d0a9fe4b833ef1a569738c99fd
This commit is contained in:
Michael Wright
2013-10-16 14:01:50 -07:00
parent 805f7a1d01
commit 4d8779fc5b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/input/Android.mk
View File

@@ -42,6 +42,8 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_C_INCLUDES := \
external/skia/include/core
LOCAL_CFLAGS += -Wno-unused-parameter
LOCAL_MODULE:= libinputservice
LOCAL_MODULE_TAGS := optional

4
services/input/SpriteController.cpp
View File

@@ -216,12 +216,12 @@ void SpriteController::doUpdateSprites() {
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);