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

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

Browse Source 
* commit 'b4f9098452aa8de8d1df7061864267588d559c40':
  Clear all StaticLayout.Builder fields on pool recycle
This commit is contained in:
Raph Levien
2015-05-07 05:26:24 +00:00
committed by Android Git Automerger
parent 7ff859377f b4f9098452
commit ff3780ee91
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);
} }