From 55fd45b273973e3e2470aeb23b6a78bb49a65762 Mon Sep 17 00:00:00 2001 From: Roozbeh Pournader Date: Thu, 3 Aug 2017 13:56:41 -0700 Subject: [PATCH] Reverse check for multi-character ellipsis Reverse a recently-introduced incorrect check for multi-character ellipsis in Layout.java. The check was introduced in Id1dfdc503f87fabed2447d55ab2107eee0eccd08. Test: bit CtsTextTestCases:* Test: bit FrameworksCoreTests:android.text. Change-Id: I79198be0bd202a303f8db02a235c2af3b76abf32 --- core/java/android/text/Layout.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index 2c84ba005352..ecefce917a7d 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -2067,9 +2067,11 @@ public abstract class Layout { final String ellipsisString = TextUtils.getEllipsisString(method); final int ellipsisStringLen = ellipsisString.length(); + // Use the ellipsis string only if there are that at least as many characters to replace. + final boolean useEllipsisString = ellipsisCount >= ellipsisStringLen; for (int i = 0; i < ellipsisCount; i++) { final char c; - if (i < ellipsisStringLen && ellipsisCount <= ellipsisStringLen) { + if (useEllipsisString && i < ellipsisStringLen) { c = ellipsisString.charAt(i); } else { c = TextUtils.ELLIPSIS_FILLER; -- 2.11.0