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

am 67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1

Browse Source 
* commit '67d54ac017494229eed27a184159461d63201a9f':
  NPE in GMail / TextLine
This commit is contained in:
Gilles Debunne
2011-12-13 13:40:00 -08:00
committed by Android Git Automerger
parent 9a8e7afc53 67d54ac017
commit 0d3a5e4cbd
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/text/TextLine.java
View File

@@ -886,7 +886,7 @@ class TextLine {
spanFlags = new int[length];
}
int count = 0;
numberOfSpans = 0;
for (int i = 0; i < length; i++) {
final E span = allSpans[i];
@@ -896,14 +896,13 @@ class TextLine {
final int spanFlag = spanned.getSpanFlags(span);
spans[i] = span;
spanStarts[i] = spanStart;
spanEnds[i] = spanEnd;
spanFlags[i] = spanFlag;
spans[numberOfSpans] = span;
spanStarts[numberOfSpans] = spanStart;
spanEnds[numberOfSpans] = spanEnd;
spanFlags[numberOfSpans] = spanFlag;
count++;
numberOfSpans++;
}
numberOfSpans = count;
}
public boolean hasSpansIntersecting(int start, int end) {
@@ -926,6 +925,7 @@ class TextLine {
}
public void recycle() {
// The spans array is guaranteed to be not null when numberOfSpans is > 0
for (int i = 0; i < numberOfSpans; i++) {
spans[i] = null; // prevent a leak: no reference kept when TextLine is recycled
}