Merge "use threadtime when collecting logcat" into nyc-mr1-dev am: 333680114d

am: 3c5b0dffe3

Change-Id: I0203a2bc1b36c32902d78d778f231e5009cb7d22

core/java/android/widget/ImageView.java

@@ -933,9 +933,8 @@ public class ImageView extends View {
             if (d.isStateful()) {
                 d.setState(getDrawableState());
             }
-            if (isAttachedToWindow()) {
-                d.setVisible(getWindowVisibility() == VISIBLE && isShown(), true);
-            }
+            d.setVisible(isAttachedToWindow() && getWindowVisibility() == VISIBLE && isShown(),
+                    true);
             d.setLevel(mLevel);
             mDrawableWidth = d.getIntrinsicWidth();
             mDrawableHeight = d.getIntrinsicHeight();