Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I8f657a99 into eclair

Browse Source 
* changes:
  Avoid a crash trying to get a substring whose start is after its end.
This commit is contained in:
Android (Google) Code Review
2009-12-14 17:41:15 -08:00
parent 7c0f00ccdd 32929413ff
commit 725218602e
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/widget/TextView.java
View File

@@ -4531,6 +4531,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
// Now use the delta to determine the actual amount of text // Now use the delta to determine the actual amount of text
// we need. // we need.
partialEndOffset += delta; partialEndOffset += delta;
if (partialStartOffset > N) {
partialStartOffset = N;
} else if (partialStartOffset < 0) {
partialStartOffset = 0;
}
if (partialEndOffset > N) { if (partialEndOffset > N) {
partialEndOffset = N; partialEndOffset = N;
} else if (partialEndOffset < 0) { } else if (partialEndOffset < 0) {