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

Commit a3924f78 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

Change-Id: I0203a2bc1b36c32902d78d778f231e5009cb7d22
parents 9cfee33a 3c5b0dff

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();