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

Commit b51c7bb1 authored by Seigo Nonaka's avatar Seigo Nonaka Committed by android-build-merger
Browse files

RESTRICT AUTOMERGE Do not compute outside given range in TextLine 

am: 4ce901e4

Change-Id: I739746d80a8dd29998a67c1d9aaa2d3f804ac57c
parents f6aa7b8d 4ce901e4

core/java/android/text/TextLine.java

+3 −9
Original line number Diff line number Diff line
@@ -239,9 +239,7 @@ class TextLine { 
        for (int i = 0; i < runs.length; i += 2) {

            int runStart = runs[i];

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

            if (runLimit > mLen) {

                runLimit = mLen;

            }

            if (runStart > mLen) break;

            boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0;



            int segstart = runStart;
@@ -316,9 +314,7 @@ class TextLine { 
        for (int i = 0; i < runs.length; i += 2) {

            int runStart = runs[i];

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

            if (runLimit > mLen) {

                runLimit = mLen;

            }

            if (runStart > mLen) break;

            boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0;



            int segstart = runStart;
@@ -405,9 +401,7 @@ class TextLine { 
        for (int i = 0; i < runs.length; i += 2) {

            int runStart = runs[i];

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

            if (runLimit > mLen) {

                runLimit = mLen;

            }

            if (runStart > mLen) break;

            boolean runIsRtl = (runs[i + 1] & Layout.RUN_RTL_FLAG) != 0;



            int segstart = runStart;