diff options
| author | 2020-09-09 20:21:10 -0700 | |
|---|---|---|
| committer | 2020-09-09 20:21:10 -0700 | |
| commit | c64112eb974e9aa7638aead998f07a868acfb5a7 (patch) | |
| tree | 503334edcee47bfd9f7a76d987d881992ecae9aa /libs/input/SpriteController.cpp | |
| parent | 104d2f92b3911576c284ddb0adf78148359883d2 (diff) | |
| parent | 14a6871e432e163533a320516ace97bd67d9c3a0 (diff) | |
Merge Android R
Bug: 168057903
Merged-In: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
Change-Id: I1d85742f594be2007c99841b290e502b6ede624e
Diffstat (limited to 'libs/input/SpriteController.cpp')
| -rw-r--r-- | libs/input/SpriteController.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libs/input/SpriteController.cpp b/libs/input/SpriteController.cpp index 5f481ca67ba6..acd8bced0612 100644 --- a/libs/input/SpriteController.cpp +++ b/libs/input/SpriteController.cpp @@ -360,12 +360,7 @@ void SpriteController::SpriteImpl::setIcon(const SpriteIcon& icon) { uint32_t dirty; if (icon.isValid()) { - SkBitmap* bitmapCopy = &mLocked.state.icon.bitmap; - if (bitmapCopy->tryAllocPixels(icon.bitmap.info().makeColorType(kN32_SkColorType))) { - icon.bitmap.readPixels(bitmapCopy->info(), bitmapCopy->getPixels(), - bitmapCopy->rowBytes(), 0, 0); - } - + mLocked.state.icon.bitmap = icon.bitmap.copy(ANDROID_BITMAP_FORMAT_RGBA_8888); if (!mLocked.state.icon.isValid() || mLocked.state.icon.hotSpotX != icon.hotSpotX || mLocked.state.icon.hotSpotY != icon.hotSpotY) { |