Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid NPE in trimToLengthWithEllipsis()."

Browse Source
This commit is contained in:
Sudheer Shanka
2020-10-08 20:15:47 +00:00
committed by Android (Google) Code Review
parent 2c9639a347 bfdc47752e
commit 389a1de0ac
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/text/TextUtils.java
View File

@@ -2173,7 +2173,7 @@ public class TextUtils {
public static <T extends CharSequence> T trimToLengthWithEllipsis(@Nullable T text,
@IntRange(from = 1) int size) {
T trimmed = trimToSize(text, size);
if (trimmed.length() < text.length()) {
if (text != null && trimmed.length() < text.length()) {
trimmed = (T) (trimmed.toString() + "...");
}
return trimmed;

1
core/tests/coretests/src/android/text/TextUtilsTest.java
View File

@@ -792,5 +792,6 @@ public class TextUtilsTest {
assertEquals("ABC...", TextUtils.trimToLengthWithEllipsis("ABCDEF", 3));
assertEquals("ABC", TextUtils.trimToLengthWithEllipsis("ABC", 3));
assertEquals("", TextUtils.trimToLengthWithEllipsis("", 3));
assertNull(TextUtils.trimToLengthWithEllipsis(null, 3));
}
}