diff options
| author | Jean Chalard <jchalard@google.com> | 2014-02-13 18:24:36 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2014-02-13 19:14:24 +0900 |
| commit | 84a3320507aa2948098c4964cea68b818f76ff88 (patch) | |
| tree | 35b1383a004007669c098fa7cad58dd7b3b3f648 /core/java/android/widget/TextView.java | |
| parent | 35fbb9f9e59795e233fb59cb5a87573e4669aebd (diff) | |
Fix a crash where user data was not validated.
ExtractedText#partialStartOffset and #partialEndOffset are
from the app, that sets it as it sees fit. We need to
validate them so that we don't crash.
Still emit a warning if this is the case, as this is
not expected.
Bug: 9570771
Change-Id: Id9d6babd1620da39bf0e454b14d7ce716bd9d9d3
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 65b79fcf75ba..e5cb16fa65e3 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -5809,6 +5809,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener int end = text.partialEndOffset; if (end > N) end = N; removeParcelableSpans(content, start, end); + // If start > end, content.replace will swap them before using them. content.replace(start, end, text.text); } } |