OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
da4cc34
)
Avoid a crash trying to get a substring whose start is after its end.
author
Eric Fischer
<enf@google.com>
Tue, 15 Dec 2009 01:33:11 +0000
(17:33 -0800)
committer
Eric Fischer
<enf@google.com>
Tue, 15 Dec 2009 01:35:36 +0000
(17:35 -0800)
Constrain the start of the extracted text, not just the end, to the length
of the content.
Approver: ryanpc
Bug:
2323813
core/java/android/widget/TextView.java
patch
|
blob
|
history
diff --git
a/core/java/android/widget/TextView.java
b/core/java/android/widget/TextView.java
index
bcdefb3
..
cdaba8a
100644
(file)
--- a/
core/java/android/widget/TextView.java
+++ b/
core/java/android/widget/TextView.java
@@
-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) {