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

Unverified Commit b85e88c3 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-8.1.0_r71' into staging/lineage-15.1_merge-android-8.1.0_r71 

Android 8.1.0 Release 71 (5948682)

* tag 'android-8.1.0_r71':
  RESTRICT AUTOMERGE Do not compute outside given range in TextLine

Change-Id: I222c66e6635c43b7ea51becffb3abe82efdc6d37
parents 1bbe2b78 4fdbba03

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;