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

Merge changes from topic 'am-9fd0a895a44f4e7ebb6eebb2d79a62a9' into nyc-mr1-dev-plus-aosp

Browse Source 
* changes:
  Merge \"Enforce consistent sizes for arrays in SpannableStringInternal\" into nyc-mr1-dev am: 4e0fc3ccd2
  Enforce consistent sizes for arrays in SpannableStringInternal am: 83549088c6
This commit is contained in:
Android Build Merger (Role)
2016-07-25 22:51:53 +00:00
committed by Android (Google) Code Review
parent 23c6d928ed b3326e1cd4
commit 982409895c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/text/SpannableStringInternal.java
View File

@@ -33,6 +33,7 @@ import java.lang.reflect.Array;
mText = source.toString().substring(start, end);
mSpans = EmptyArray.OBJECT;
// Invariant: mSpanData.length = mSpans.length * COLUMNS
mSpanData = EmptyArray.INT;
if (source instanceof Spanned) {
@@ -99,7 +100,7 @@ import java.lang.reflect.Array;
Object[] srcSpans = src.mSpans;
mSpanCount = count;
mSpans = ArrayUtils.newUnpaddedObjectArray(mSpanCount);
mSpanData = new int[mSpanCount * COLUMNS];
mSpanData = new int[mSpans.length * COLUMNS];
for (int i = 0, j = 0; i < limit; i++) {
int spanStart = srcData[i * COLUMNS + START];
int spanEnd = srcData[i * COLUMNS + END];