Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 692adf6a authored by Roozbeh Pournader's avatar Roozbeh Pournader Committed by Android (Google) Code Review
Browse files

Merge "Fix unintentional NPE in SpannableStringBuilder."

parents 0ca8da52 cd217b8a

core/java/android/text/SpannableStringBuilder.java

+4 −2
Original line number Diff line number Diff line
@@ -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);