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

Commit c8ba822a authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/cm-14.1' into v1-nougat

parents e44aac03 434f2bce

core/java/android/text/TextLine.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -208,6 +208,7 @@ class TextLine { 
        int lastRunIndex = runs.length - 2;

        int lastRunIndex = runs.length - 2;

        for (int i = 0; i < runs.length; i += 2) {

        for (int i = 0; i < runs.length; i += 2) {

            int runStart = runs[i];

            int runStart = runs[i];

            if (runStart > mLen) break;

            int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK);

            int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK);

            if (runLimit > mLen) {

            if (runLimit > mLen) {

                runLimit = mLen;

                runLimit = mLen;
@@ -285,6 +286,7 @@ class TextLine { 
        int[] runs = mDirections.mDirections;

        int[] runs = mDirections.mDirections;

        for (int i = 0; i < runs.length; i += 2) {

        for (int i = 0; i < runs.length; i += 2) {

            int runStart = runs[i];

            int runStart = runs[i];

            if (runStart > mLen) break;

            int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK);

            int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK);

            if (runLimit > mLen) {

            if (runLimit > mLen) {

                runLimit = mLen;

                runLimit = mLen;
@@ -374,6 +376,7 @@ class TextLine { 
        int[] runs = mDirections.mDirections;

        int[] runs = mDirections.mDirections;

        for (int i = 0; i < runs.length; i += 2) {

        for (int i = 0; i < runs.length; i += 2) {

            int runStart = runs[i];

            int runStart = runs[i];

            if (runStart > mLen) break;

            int runLimit = runStart + (runs[i + 1] & Layout.RUN_LENGTH_MASK);

            int runLimit = runStart + (runs[i + 1] & Layout.RUN_LENGTH_MASK);

            if (runLimit > mLen) {

            if (runLimit > mLen) {

                runLimit = mLen;

                runLimit = mLen;