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

Fabrice Di Meglio · Android (Google) Code Review · commit 8eb34ed88cdc · 2011-09-26T12:16:30.000-07:00
diff --git a/core/java/android/text/DynamicLayout.java b/core/java/android/text/DynamicLayout.java
@@ -275,7 +275,7 @@ private void reflow(CharSequence s, int where, int before, int after) {
         }
 
         if (reflowed == null) {
-            reflowed = new StaticLayout(getText());
+            reflowed = new StaticLayout(null);
         } else {
             reflowed.prepare();
         }
@@ -488,7 +488,7 @@ public int getEllipsisCount(int line) {
 
     private int mTopPadding, mBottomPadding;
 
-    private static StaticLayout sStaticLayout = null;
+    private static StaticLayout sStaticLayout = new StaticLayout(null);
 
     private static final Object[] sLock = new Object[0];
 

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ private void reflow(CharSequence s, int where, int before, int after) {`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`if (reflowed == null) {`
`278`		`- reflowed = new StaticLayout(getText());`
	`278`	`+ reflowed = new StaticLayout(null);`
`279`	`279`	`} else {`
`280`	`280`	`reflowed.prepare();`
`281`	`281`	`}`
`@@ -488,7 +488,7 @@ public int getEllipsisCount(int line) {`
`488`	`488`
`489`	`489`	`private int mTopPadding, mBottomPadding;`
`490`	`490`
`491`		`- private static StaticLayout sStaticLayout = null;`
	`491`	`+ private static StaticLayout sStaticLayout = new StaticLayout(null);`
`492`	`492`
`493`	`493`	`private static final Object[] sLock = new Object[0];`
`494`	`494`