Merge cherrypicks of [9415544] into qt-qpr1-release (045b51c3) · Commits · e / os / android_frameworks_base

core/java/android/text/TextLine.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -276,6 +276,7 @@ public class TextLine {
		final int runCount = mDirections.getRunCount();
		for (int runIndex = 0; runIndex < runCount; runIndex++) {
		final int runStart = mDirections.getRunStart(runIndex);
		if (runStart > mLen) break;
		final int runLimit = Math.min(runStart + mDirections.getRunLength(runIndex), mLen);
		final boolean runIsRtl = mDirections.isRunRtl(runIndex);

		@@ -360,6 +361,7 @@ public class TextLine {
		float h = 0;
		for (int runIndex = 0; runIndex < mDirections.getRunCount(); runIndex++) {
		final int runStart = mDirections.getRunStart(runIndex);
		if (runStart > mLen) break;
		final int runLimit = Math.min(runStart + mDirections.getRunLength(runIndex), mLen);
		final boolean runIsRtl = mDirections.isRunRtl(runIndex);

		@@ -417,6 +419,7 @@ public class TextLine {
		float h = 0;
		for (int runIndex = 0; runIndex < mDirections.getRunCount(); runIndex++) {
		final int runStart = mDirections.getRunStart(runIndex);
		if (runStart > mLen) break;
		final int runLimit = Math.min(runStart + mDirections.getRunLength(runIndex), mLen);
		final boolean runIsRtl = mDirections.isRunRtl(runIndex);