diff options
| author | Chris Craik <ccraik@google.com> | 2013-11-06 23:23:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-06 23:23:56 +0000 |
| commit | 47742d4bb004a51c045d443024a36d784cd38d9b (patch) | |
| tree | aa450e84607513558906e50ab6275c4dfc2f542f /graphics | |
| parent | e77d2a9c62e747902bc53d40e303214705702b00 (diff) | |
| parent | 222f2ad294c9046b62af5e059f8b409aec044ce9 (diff) | |
| download | frameworks_base-47742d4bb004a51c045d443024a36d784cd38d9b.zip frameworks_base-47742d4bb004a51c045d443024a36d784cd38d9b.tar.gz frameworks_base-47742d4bb004a51c045d443024a36d784cd38d9b.tar.bz2 | |
Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-dev
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/Bitmap.java | 5 |
1 files changed, 5 insertions, 0 deletions
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 @@ 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; } |