Merge "Clear all StaticLayout.Builder fields on pool recycle" into mnc-dev

2015-05-06 21:35:11 +00:00
parent 03dbaf15ee 3bd60c7b11
commit 6402dc7e4a
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/text/StaticLayout.java
+++ b/core/java/android/text/StaticLayout.java
@@ -91,6 +91,7 @@ public class StaticLayout extends Layout {
            b.mEllipsizedWidth = width;
            b.mEllipsize = null;
            b.mMaxLines = Integer.MAX_VALUE;
+            b.mBreakStrategy = Layout.BREAK_STRATEGY_SIMPLE;

            b.mMeasuredText = MeasuredText.obtain();
            return b;
@@ -100,6 +101,8 @@ public class StaticLayout extends Layout {
            b.mPaint = null;
            b.mText = null;
            MeasuredText.recycle(b.mMeasuredText);
+            b.mMeasuredText = null;
+            nFinishBuilder(b.mNativePtr);
            sPool.release(b);
        }