am a6b5eca7: Merge "Don\'t trigger log for empty views" into jb-mr1-dev

* commit 'a6b5eca796e3d70f29a42b32d742807f5b38aad9':
  Don't trigger log for empty views
This commit is contained in:
Chris Craik
2012-09-06 15:11:39 -07:00
committed by Android Git Automerger

View File

@@ -12541,9 +12541,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
final int drawingCacheSize =
ViewConfiguration.get(mContext).getScaledMaximumDrawingCacheSize();
if (width <= 0 || height <= 0 || projectedBitmapSize > drawingCacheSize) {
Log.w(VIEW_LOG_TAG, "View too large to fit into drawing cache, needs "
+ projectedBitmapSize + " bytes, only "
+ drawingCacheSize + " available");
if (width > 0 && height > 0) {
Log.w(VIEW_LOG_TAG, "View too large to fit into drawing cache, needs "
+ projectedBitmapSize + " bytes, only "
+ drawingCacheSize + " available");
}
destroyDrawingCache();
mCachingFailed = true;
return;