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

Commit df8427c3 authored by Raph Levien's avatar Raph Levien Committed by Android (Google) Code Review
Browse files

Merge "Fix android.text.cts.TextUtilsTest#testRegionMatches"

parents 8a17910f 8d2aa199
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -48,10 +48,11 @@ import android.text.style.URLSpan;
import android.text.style.UnderlineSpan;
import android.util.Log;
import android.util.Printer;

import android.view.View;

import com.android.internal.R;
import com.android.internal.util.ArrayUtils;

import libcore.icu.ICU;

import java.lang.reflect.Array;
@@ -229,7 +230,12 @@ public class TextUtils {
    public static boolean regionMatches(CharSequence one, int toffset,
                                        CharSequence two, int ooffset,
                                        int len) {
        char[] temp = obtain(2 * len);
        int tempLen = 2 * len;
        if (tempLen < len) {
            // Integer overflow; len is unreasonably large
            throw new IndexOutOfBoundsException();
        }
        char[] temp = obtain(tempLen);

        getChars(one, toffset, toffset + len, temp, 0);
        getChars(two, ooffset, ooffset + len, temp, len);