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

Merge "Fix bug #5344067 android.text.DynamicLayout.sStaticLayout can hold onto an Activity, potential memory leak"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2011-09-26 12:16:30 -07:00
committed by Android (Google) Code Review
parent 4da465a056 09175735c5
commit 8eb34ed88c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/text/DynamicLayout.java
View File

@@ -275,7 +275,7 @@ extends Layout
} }
if (reflowed == null) { if (reflowed == null) {
reflowed = new StaticLayout(getText()); reflowed = new StaticLayout(null);
} else { } else {
reflowed.prepare(); reflowed.prepare();
} }
@@ -488,7 +488,7 @@ extends Layout
private int mTopPadding, mBottomPadding; private int mTopPadding, mBottomPadding;
private static StaticLayout sStaticLayout = null; private static StaticLayout sStaticLayout = new StaticLayout(null);
private static final Object[] sLock = new Object[0]; private static final Object[] sLock = new Object[0];