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

Commit 1350a5f4 authored by Matt Sarett's avatar Matt Sarett
Browse files

Remove use of SkBitmap::copyTo() 

This API is deprecated in Skia.

Test: Refactor.  Flashed device.

Change-Id: I590de3b8280729182442ec52a4fc4538d11e78d8
parent 503af47c

services/core/jni/com_android_server_input_InputManagerService.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -1504,7 +1504,11 @@ static void nativeSetCustomPointerIcon(JNIEnv* env, jclass /* clazz */, 
    }

    }





    SpriteIcon spriteIcon;

    SpriteIcon spriteIcon;

    pointerIcon.bitmap.copyTo(&spriteIcon.bitmap, kN32_SkColorType);

    SkImageInfo spriteInfo = pointerIcon.bitmap.info().makeColorType(kN32_SkColorType);

    if (spriteIcon.bitmap.tryAllocPixels(spriteInfo)) {

        pointerIcon.bitmap.readPixels(spriteInfo, spriteIcon.bitmap.getPixels(),

                spriteIcon.bitmap.rowBytes(), 0, 0);

    }

    spriteIcon.hotSpotX = pointerIcon.hotSpotX;

    spriteIcon.hotSpotX = pointerIcon.hotSpotX;

    spriteIcon.hotSpotY = pointerIcon.hotSpotY;

    spriteIcon.hotSpotY = pointerIcon.hotSpotY;

    im->setCustomPointerIcon(spriteIcon);

    im->setCustomPointerIcon(spriteIcon);