From 222f2ad294c9046b62af5e059f8b409aec044ce9 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Wed, 6 Nov 2013 14:01:28 -0800 Subject: [PATCH] Fix NPE with inPurgeable Bitmaps in getAllocationByteCount bug:11556330 Change-Id: I430136ea15baeb60adfb9bb2acdde9505ce707fe --- graphics/java/android/graphics/Bitmap.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index 4c7395c7b98f..8c38d25d94e8 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -1167,6 +1167,11 @@ public final class Bitmap implements Parcelable { * @see #reconfigure(int, int, Config) */ public final int getAllocationByteCount() { + if (mBuffer == null) { + // native backed bitmaps don't support reconfiguration, + // so alloc size is always content size + return getByteCount(); + } return mBuffer.length; } -- 2.11.0