diff options
| -rw-r--r-- | core/java/android/text/SpannableStringBuilder.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/text/SpannableStringBuilder.java b/core/java/android/text/SpannableStringBuilder.java index 992dc4dcf6dd..40315add603d 100644 --- a/core/java/android/text/SpannableStringBuilder.java +++ b/core/java/android/text/SpannableStringBuilder.java @@ -16,6 +16,7 @@ package android.text; +import android.annotation.Nullable; import android.graphics.Canvas; import android.graphics.Paint; import android.util.Log; @@ -814,8 +815,9 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable * a list of all the spans regardless of type. */ @SuppressWarnings("unchecked") - public <T> T[] getSpans(int queryStart, int queryEnd, Class<T> kind) { - if (kind == null || mSpanCount == 0) return ArrayUtils.emptyArray(kind); + public <T> T[] getSpans(int queryStart, int queryEnd, @Nullable Class<T> kind) { + if (kind == null) return (T[]) ArrayUtils.emptyArray(Object.class); + if (mSpanCount == 0) return ArrayUtils.emptyArray(kind); int count = countSpans(queryStart, queryEnd, kind, treeRoot()); if (count == 0) { return ArrayUtils.emptyArray(kind); |