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

Commit 6d11ca44 authored by Mike Wallstedt's avatar Mike Wallstedt
Browse files

Avoid ambiguous overloads in SpannableStringInternal. 

As documented in Effective Java (http://go/ej3e#page=259), overloaded
methods with the same number of parameters can be confusing when the
parameters are in the same type hierarchy.

Aside from readability concerns, this may be related to some crashes
observed in Photos Android. For example in b/144849105 AutoCompleteViewBinder
calls the SpannedString constructor, which delegates to SpannedStringInternal.
The overload of copySpans that accepts a SpannedStringInternal has a call to
isOutOfCopyRange that should make the failure in checkRange impossible.

Bug: 144849105
Test: Simple refactor.
Change-Id: I47d01cffe6f66c4d631a9ef1341bf118fb6e51e4
parent 3ebefd8e

core/java/android/text/SpannableStringInternal.java

+7 −6
Original line number Diff line number Diff line
@@ -40,9 +40,10 @@ import java.lang.reflect.Array; 


        if (source instanceof Spanned) {

            if (source instanceof SpannableStringInternal) {

                copySpans((SpannableStringInternal) source, start, end, ignoreNoCopySpan);

                copySpansFromInternal(

                        (SpannableStringInternal) source, start, end, ignoreNoCopySpan);

            } else {

                copySpans((Spanned) source, start, end, ignoreNoCopySpan);

                copySpansFromSpanned((Spanned) source, start, end, ignoreNoCopySpan);

            }

        }

    }
@@ -65,7 +66,7 @@ import java.lang.reflect.Array; 
     * @param end End index in the source object.

     * @param ignoreNoCopySpan whether to copy NoCopySpans in the {@code source}

     */

    private void copySpans(Spanned src, int start, int end, boolean ignoreNoCopySpan) {

    private void copySpansFromSpanned(Spanned src, int start, int end, boolean ignoreNoCopySpan) {

        Object[] spans = src.getSpans(start, end, Object.class);



        for (int i = 0; i < spans.length; i++) {
@@ -94,7 +95,7 @@ import java.lang.reflect.Array; 
     * @param end End index in the source object.

     * @param ignoreNoCopySpan copy NoCopySpan for backward compatible reasons.

     */

    private void copySpans(SpannableStringInternal src, int start, int end,

    private void copySpansFromInternal(SpannableStringInternal src, int start, int end,

            boolean ignoreNoCopySpan) {

        int count = 0;

        final int[] srcData = src.mSpanData;
@@ -555,12 +556,12 @@ import java.lang.reflect.Array; 
     */

    @UnsupportedAppUsage

    private void copySpans(Spanned src, int start, int end) {

        copySpans(src, start, end, false);

        copySpansFromSpanned(src, start, end, false);

    }



    @UnsupportedAppUsage

    private void copySpans(SpannableStringInternal src, int start, int end) {

        copySpans(src, start, end, false);

        copySpansFromInternal(src, start, end, false);

    }