diff options
| author | Chris Craik <ccraik@google.com> | 2013-11-06 15:33:42 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-06 15:33:42 -0800 |
| commit | a2801c5f642b6a2585fdeb7921eb9104db8956f2 (patch) | |
| tree | 53d8ddb649abf197edfe2b42e09b757a15ee54e1 /graphics/java/android | |
| parent | 9cd3b1218e8789aed5e8c746568e43ff4e5481b5 (diff) | |
| parent | 4899398dcad50d1b9734ca5f8959712f42f72b02 (diff) | |
| download | frameworks_base-a2801c5f642b6a2585fdeb7921eb9104db8956f2.zip frameworks_base-a2801c5f642b6a2585fdeb7921eb9104db8956f2.tar.gz frameworks_base-a2801c5f642b6a2585fdeb7921eb9104db8956f2.tar.bz2 | |
am 4899398d: am baba771c: am 47742d4b: Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-dev
* commit '4899398dcad50d1b9734ca5f8959712f42f72b02':
Fix NPE with inPurgeable Bitmaps in getAllocationByteCount
Diffstat (limited to 'graphics/java/android')
| -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 6d60dd2..3c24683 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; } |