commit 84c45e7085f37bfee73247e1ba98e8a9fa4ee75a
author Raph Levien <raph@google.com> Tue Aug 30 17:36:33 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 30 17:36:33 2016 +0000
tree d7a0d00b7666074e863bf7a15d2f40f43554c77c
parent c1d52a634c8766c71715de8586f75f82baa3e736
parent 9cde7244b633028d12fedcf3c66f16c0f25af9a7

Enforce consistent sizes for arrays in SpannableStringInternal
am: 9cde7244b6

Change-Id: Ie1fa575d83754d39a6bc30ba542411709f7a2c46

core/java/android/text/SpannableStringInternal.java

diff --git a/core/java/android/text/SpannableStringInternal.java b/core/java/android/text/SpannableStringInternal.java
index 47e71be..4b02df86 100644
--- a/core/java/android/text/SpannableStringInternal.java
+++ b/core/java/android/text/SpannableStringInternal.java
@@ -33,6 +33,7 @@
             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 @@
             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];