diff options
| author | Romain Guy <romainguy@google.com> | 2012-09-30 11:28:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-30 11:28:54 -0700 |
| commit | 8ed6b6a96bf887e0b49c48838a9f22bb0f256296 (patch) | |
| tree | 55fc0f9f65af8c5c23aa079cbff001269d189cb6 /core/java/android | |
| parent | 955b66d07db37bcec379a5cb9ea01aa72c54cdb4 (diff) | |
| parent | af61cc4cbb307dc3b9cb6f4aa232a0257157c9d2 (diff) | |
| download | frameworks_base-8ed6b6a96bf887e0b49c48838a9f22bb0f256296.zip frameworks_base-8ed6b6a96bf887e0b49c48838a9f22bb0f256296.tar.gz frameworks_base-8ed6b6a96bf887e0b49c48838a9f22bb0f256296.tar.bz2 | |
Merge "Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930" into jb-mr1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/View.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 128a190..a5728f4 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -12811,8 +12811,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, final boolean opaque = drawingCacheBackgroundColor != 0 || isOpaque(); final boolean use32BitCache = attachInfo != null && attachInfo.mUse32BitDrawingCache; - final int projectedBitmapSize = width * height * (opaque && !use32BitCache ? 2 : 4); - final int drawingCacheSize = + final long projectedBitmapSize = width * height * (opaque && !use32BitCache ? 2 : 4); + final long drawingCacheSize = ViewConfiguration.get(mContext).getScaledMaximumDrawingCacheSize(); if (width <= 0 || height <= 0 || projectedBitmapSize > drawingCacheSize) { if (width > 0 && height > 0) { |