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

Commit 47538fe6 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 3337 into donut 

* changes:
  Fix external bug 2875: Matrix#mValues[7] assigned twice in place of mValues[8]
parents 39665367 1741ec39

tools/layoutlib/bridge/src/android/graphics/Matrix.java

+66 −66
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ public class Matrix extends _Original_Matrix { 
        mValues[5] = dy;

        mValues[6] = 0;

        mValues[7] = 0;

        mValues[7] = 1;

        mValues[8] = 1;

    }



    /**
@@ -200,7 +200,7 @@ public class Matrix extends _Original_Matrix { 
        mValues[5] = -py;

        mValues[6] = 0;

        mValues[7] = 0;

        mValues[7] = 1;

        mValues[8] = 1;



        // scale

        addTransform(new float[] { sx, 0, 0, 0, sy, 0, 0, 0, 1 });
@@ -219,7 +219,7 @@ public class Matrix extends _Original_Matrix { 
        mValues[5] = 0;

        mValues[6] = 0;

        mValues[7] = 0;

        mValues[7] = 1;

        mValues[8] = 1;

    }



    /**
@@ -240,7 +240,7 @@ public class Matrix extends _Original_Matrix { 
        mValues[5] = -py;

        mValues[6] = 0;

        mValues[7] = 0;

        mValues[7] = 1;

        mValues[8] = 1;



        // scale

        double rad = Math.toRadians(degrees);
@@ -268,7 +268,7 @@ public class Matrix extends _Original_Matrix { 
        mValues[5] = 0;

        mValues[6] = 0;

        mValues[7] = 0;

        mValues[7] = 1;

        mValues[8] = 1;

    }



    /**
@@ -289,7 +289,7 @@ public class Matrix extends _Original_Matrix { 
        mValues[5] = -py;

        mValues[6] = 0;

        mValues[7] = 0;

        mValues[7] = 1;

        mValues[8] = 1;



        // scale

        addTransform(new float[] { cosValue, -sinValue, 0, sinValue, cosValue, 0, 0, 0, 1 });
@@ -308,7 +308,7 @@ public class Matrix extends _Original_Matrix { 
        mValues[5] = 0;

        mValues[6] = 0;

        mValues[7] = 0;

        mValues[7] = 1;

        mValues[8] = 1;

    }



    /**
@@ -329,7 +329,7 @@ public class Matrix extends _Original_Matrix { 
        mValues[5] = -py;

        mValues[6] = 0;

        mValues[7] = 0;

        mValues[7] = 1;

        mValues[8] = 1;



        // scale

        addTransform(new float[] { 1, kx, 0, ky, 1, 0, 0, 0, 1 });
@@ -348,7 +348,7 @@ public class Matrix extends _Original_Matrix { 
        mValues[5] = 0;

        mValues[6] = 0;

        mValues[7] = 0;

        mValues[7] = 1;

        mValues[8] = 1;

    }



    /**