Don't break lines in the middle of a smiley or other graphic replacement.

The code that was supposed to keep this from happening was not being
executed when the text was all ASCII.

Bug 1899722

Change-Id: Ifc97a4423d6136e19abbc4c82eb36ac0216ce415

parent 8af295af

core/java/android/text/StaticLayout.java

+13 −13

Original line number	Diff line number	Diff line
		@@ -233,7 +233,6 @@ extends Layout
		}
		}

		if (!easy) {
		// Ensure that none of the underlying characters are treated
		// as viable breakpoints, and that the entire run gets the
		// same bidi direction.
		@@ -252,6 +251,7 @@ extends Layout
		}
		}

		if (!easy) {
		// XXX put override flags, etc. into chdirs
		dir = bidi(dir, chs, chdirs, n, false);