diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-07 13:54:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-07 13:54:55 +0000 |
| commit | df8afda623ce4dbbad3a00743c931b4d0d9a0f2d (patch) | |
| tree | 0d4c7a2cdb71535053c67d0904019dde6bc8a7c0 /libs/hwui/apex/android_bitmap.cpp | |
| parent | 4a948cabba107aff46e95fe512f7b071e76cd6fd (diff) | |
| parent | 10dd5e9a185bb7ffad04cd097b64741afe63e97c (diff) | |
Merge "Don't update the genID for an immutable bitmap" into rvc-dev am: 10dd5e9a18
Change-Id: I54d13f204587340eac67775212811f4b4b344c43
Diffstat (limited to 'libs/hwui/apex/android_bitmap.cpp')
| -rw-r--r-- | libs/hwui/apex/android_bitmap.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/hwui/apex/android_bitmap.cpp b/libs/hwui/apex/android_bitmap.cpp index b56a619b00aa..3780ba072308 100644 --- a/libs/hwui/apex/android_bitmap.cpp +++ b/libs/hwui/apex/android_bitmap.cpp @@ -163,10 +163,9 @@ jobject ABitmapConfig_getConfigFromFormat(JNIEnv* env, AndroidBitmapFormat forma void ABitmap_notifyPixelsChanged(ABitmap* bitmapHandle) { Bitmap* bitmap = TypeCast::toBitmap(bitmapHandle); - if (bitmap->isImmutable()) { - ALOGE("Attempting to modify an immutable Bitmap!"); + if (!bitmap->isImmutable()) { + bitmap->notifyPixelsChanged(); } - return bitmap->notifyPixelsChanged(); } namespace { |