| commit | 222f2ad294c9046b62af5e059f8b409aec044ce9 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Wed Nov 06 14:01:28 2013 -0800 |
| committer | Chris Craik <ccraik@google.com> | Wed Nov 06 14:01:28 2013 -0800 |
| tree | 83c65f8b1f0572295a6a3823294631258f86f719 | |
| parent | 194271565399a9216b8e0dece118874fc5f7e474 [diff] |
Fix NPE with inPurgeable Bitmaps in getAllocationByteCount bug:11556330 Change-Id: I430136ea15baeb60adfb9bb2acdde9505ce707fe
diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index 4c7395c..8c38d25 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java
@@ -1167,6 +1167,11 @@ * @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; }