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

Commit 96c2a83c authored by Dake Gu's avatar Dake Gu Committed by Android Git Automerger
Browse files

am 05d48504: am af6dd103: Merge "fix ImageView.getImageMatrix()" into jb-mr1-aah-dev 

* commit '05d48504':
  fix ImageView.getImageMatrix()
parents 8a9120f0 05d48504

core/java/android/widget/ImageView.java

+4 −1
Original line number Diff line number Diff line
@@ -567,7 +567,10 @@ public class ImageView extends View { 
        applied to the drawable, be sure to call setImageMatrix().

    */

    public Matrix getImageMatrix() {

        return mMatrix;

        if (mDrawMatrix == null) {

            return Matrix.IDENTITY_MATRIX;

        }

        return mDrawMatrix;

    }



    public void setImageMatrix(Matrix matrix) {