diff options
| author | Chris Craik <ccraik@google.com> | 2013-11-06 15:26:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-06 15:26:51 -0800 |
| commit | baba771c85ec4a8d56e07c0d963c663a99cfa0e3 (patch) | |
| tree | eb3ed2ea90bc58d5abd719ce1c4977b6020acd1a /graphics | |
| parent | 9aed2ae0bd03edcaef3dd3cac8795055cf8d2b43 (diff) | |
| parent | 47742d4bb004a51c045d443024a36d784cd38d9b (diff) | |
| download | frameworks_base-baba771c85ec4a8d56e07c0d963c663a99cfa0e3.zip frameworks_base-baba771c85ec4a8d56e07c0d963c663a99cfa0e3.tar.gz frameworks_base-baba771c85ec4a8d56e07c0d963c663a99cfa0e3.tar.bz2 | |
am 47742d4b: Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-dev
* commit '47742d4bb004a51c045d443024a36d784cd38d9b':
Fix NPE with inPurgeable Bitmaps in getAllocationByteCount
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; } |