Merge "Don't trigger log for empty views" into jb-mr1-dev

2012-09-06 15:05:38 -07:00
parent c862d0fc05 3667aa364f
commit a6b5eca796
1 changed files with 5 additions and 3 deletions
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -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;