Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a3dc303 authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Disable unused parameter warning for libinput"

parents de83ff24 4d8779fc

services/input/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

services/input/SpriteController.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);