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

Commit 890f20e8 authored by George Mount's avatar George Mount Committed by Android Git Automerger
Browse files

am 039cc060: am 82fd8428: Merge "Protect against ImageView changing to a null... 

am 039cc060: am 82fd8428: Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev

* commit '039cc060':
  Protect against ImageView changing to a null Drawable during Transition.
parents ab43570f 039cc060

core/java/android/widget/ImageView.java

+3 −0
Original line number Diff line number Diff line
@@ -1120,6 +1120,9 @@ public class ImageView extends View { 


    /** @hide */

    public void animateTransform(Matrix matrix) {

        if (mDrawable == null) {

            return;

        }

        if (matrix == null) {

            mDrawable.setBounds(0, 0, getWidth(), getHeight());

        } else {