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

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

Browse Source
This commit is contained in:
Raph Levien
2015-05-06 21:35:11 +00:00
committed by Android (Google) Code Review
parent 03dbaf15ee 3bd60c7b11
commit 6402dc7e4a
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,6 +91,7 @@ public class StaticLayout extends Layout {
b.mEllipsizedWidth = width; b.mEllipsizedWidth = width;
b.mEllipsize = null; b.mEllipsize = null;
b.mMaxLines = Integer.MAX_VALUE; b.mMaxLines = Integer.MAX_VALUE;
b.mBreakStrategy = Layout.BREAK_STRATEGY_SIMPLE;
b.mMeasuredText = MeasuredText.obtain(); b.mMeasuredText = MeasuredText.obtain();
return b; return b;
@@ -100,6 +101,8 @@ public class StaticLayout extends Layout {
b.mPaint = null; b.mPaint = null;
b.mText = null; b.mText = null;
MeasuredText.recycle(b.mMeasuredText); MeasuredText.recycle(b.mMeasuredText);
b.mMeasuredText = null;
nFinishBuilder(b.mNativePtr);
sPool.release(b); sPool.release(b);
} }