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

Commit 9eddf7ae authored by Siyamed Sinir's avatar Siyamed Sinir Committed by android-build-merger
Browse files

Merge \"Fix int overflow in SpannableStringBuilder.replace\" into nyc-dev 

am: 96c3e550

Change-Id: Ibac22676dcfcd8874bc2415f7fb4f76849896748
parents 89b79349 96c3e550

core/java/android/text/SpannableStringBuilder.java

+4 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.text; 
import android.annotation.Nullable;

import android.graphics.Canvas;

import android.graphics.Paint;

import android.text.style.ParagraphStyle;

import android.util.Log;



import com.android.internal.util.ArrayUtils;
@@ -554,7 +553,8 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable 
        if (adjustSelection) {

            boolean changed = false;

            if (selectionStart > start && selectionStart < end) {

                final int offset = (selectionStart - start) * newLen / origLen;

                final long diff = selectionStart - start;

                final int offset = Math.toIntExact(diff * newLen / origLen);

                selectionStart = start + offset;



                changed = true;
@@ -562,7 +562,8 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable 
                        Spanned.SPAN_POINT_POINT);

            }

            if (selectionEnd > start && selectionEnd < end) {

                final int offset = (selectionEnd - start) * newLen / origLen;

                final long diff = selectionEnd - start;

                final int offset = Math.toIntExact(diff * newLen / origLen);

                selectionEnd = start + offset;



                changed = true;