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

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

RESTRICT AUTOMERGE Revive runLimit check logic 

am: b730f198

Change-Id: I329515d36c12ee5e12a63262ff7db8daff350832
parents b51c7bb1 b730f198

core/java/android/text/TextLine.java

+9 −0
Original line number Diff line number Diff line
@@ -239,6 +239,9 @@ 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;
@@ -314,6 +317,9 @@ 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;
@@ -401,6 +407,9 @@ 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;