diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-07 13:46:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-07 13:46:17 +0000 |
| commit | 10dd5e9a185bb7ffad04cd097b64741afe63e97c (patch) | |
| tree | 40cd960b7e5e36554ab43aad5d7b0140f223630c /libs/hwui/apex/android_bitmap.cpp | |
| parent | 46b8dc5f20763769e063d26ccb40f4713c7320b3 (diff) | |
| parent | d3e9eecf5b2d70386a5557dc033b3d3abae72dc8 (diff) | |
Merge "Don't update the genID for an immutable bitmap" into rvc-dev
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 { |