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

Commit 7bbb1999 authored by Eric Fischer's avatar Eric Fischer Committed by Android Git Automerger
Browse files

am 72521860: Merge change I8f657a99 into eclair 

Merge commit '72521860' into eclair-plus-aosp

* commit '72521860':
  Avoid a crash trying to get a substring whose start is after its end.
parents a7cd86f9 72521860

core/java/android/widget/TextView.java

+5 −0
Original line number Diff line number Diff line
@@ -4531,6 +4531,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                    // Now use the delta to determine the actual amount of text

                    // we need.

                    partialEndOffset += delta;

                    if (partialStartOffset > N) {

                        partialStartOffset = N;

                    } else if (partialStartOffset < 0) {

                        partialStartOffset = 0;

                    }

                    if (partialEndOffset > N) {

                        partialEndOffset = N;

                    } else if (partialEndOffset < 0) {