Merge "RESTRICT AUTOMERGE Revive runLimit check logic" into pi-dev (d7f6ede2) · Commits · e / os / android_frameworks_base

core/java/android/text/TextLine.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -257,6 +257,9 @@ public 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;

		@@ -333,6 +336,9 @@ public 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;

		@@ -420,6 +426,9 @@ public 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;