Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25c8c198 authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am 8ed6b6a9: Merge "Perform a long computation to catch bitmap sizes > 32 bits... 

am 8ed6b6a9: Merge "Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930" into jb-mr1-dev

* commit '8ed6b6a9':
  Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930
parents dd2dd7bb 8ed6b6a9

core/java/android/view/View.java

+2 −2
Original line number Diff line number Diff line
@@ -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) {