From d3e9eecf5b2d70386a5557dc033b3d3abae72dc8 Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Mon, 6 Apr 2020 11:43:59 -0400 Subject: Don't update the genID for an immutable bitmap AndroidBitmap_unlockPixels is the only way to release the ref on pixels acquired using AndroidBitmap_lockPixels. Apps that lock an immutable bitmap therefore are forced to call unlock pixels. Prior to this CL the unlock would update the GenID of the bitmap and also print a warning that the app was modifying an immutable bitmap. After this CL the bitmap's GenID will not be updated and no warning will be printed. As a result, apps that were using the NDK to allow them to mutate immutable bitmaps will break without getting a warning message. Test: hwui_unit_tests Bug: 150823341 Change-Id: Ie5e5cf86a7a83d53c179c9b3cf9be1a0566cfd93 --- libs/hwui/apex/android_bitmap.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'libs/hwui/apex/android_bitmap.cpp') 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 { -- cgit v1.2.3