am 6402dc7e: Merge "Clear all StaticLayout.Builder fields on pool recycle" into mnc-dev

* commit '6402dc7e4adbfb64ee80858292958ed217560c12':
  Clear all StaticLayout.Builder fields on pool recycle
This commit is contained in:
Raph Levien
2015-05-06 21:44:28 +00:00
committed by Android Git Automerger

View File

@@ -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);
}