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

Commit 22bf2537 authored by Guang Zhu's avatar Guang Zhu Committed by android-build-merger
Browse files

Merge "use threadtime when collecting logcat" into nyc-mr1-dev am: 33368011 am: 3c5b0dff 

am: a3924f78

Change-Id: I38225078db5d41dd4fc120c0a4b7f9b13f537de0
parents 42559856 a3924f78

core/java/android/widget/ImageView.java

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