diff options
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/text/TextUtils.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index e3a2455ee37f..579210507db3 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -48167,7 +48167,7 @@ package android.text { method public static void dumpSpans(CharSequence, android.util.Printer, String); method public static CharSequence ellipsize(CharSequence, android.text.TextPaint, float, android.text.TextUtils.TruncateAt); method public static CharSequence ellipsize(CharSequence, android.text.TextPaint, float, android.text.TextUtils.TruncateAt, boolean, @Nullable android.text.TextUtils.EllipsizeCallback); - method public static boolean equals(CharSequence, CharSequence); + method public static boolean equals(@Nullable CharSequence, @Nullable CharSequence); method public static CharSequence expandTemplate(CharSequence, java.lang.CharSequence...); method public static int getCapsMode(CharSequence, int, int); method public static void getChars(CharSequence, int, int, char[], int); diff --git a/core/java/android/text/TextUtils.java b/core/java/android/text/TextUtils.java index 6ea462eb969f..71c9a2a888be 100644 --- a/core/java/android/text/TextUtils.java +++ b/core/java/android/text/TextUtils.java @@ -675,7 +675,7 @@ public class TextUtils { * @return true if a and b are equal */ @android.ravenwood.annotation.RavenwoodKeep - public static boolean equals(CharSequence a, CharSequence b) { + public static boolean equals(@Nullable CharSequence a, @Nullable CharSequence b) { if (a == b) return true; int length; if (a != null && b != null && (length = a.length()) == b.length()) { |