commit 7d8fc3c911ea8e4cd1e6531118da4f72e521a944
author Amith Yamasani <yamasani@google.com> Mon Aug 15 11:14:19 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 15 11:14:19 2011 -0700
tree ef738564c029b4a9560090b15c446273f961c200
parent 8f8dae158b8942bf58b2cbbb21cf9d5bbd67d47e
parent b724c346e19d63d7ff194b2b06c4a1e0f7bc07b7

Merge "Revert "Use a weakreference to prevent the static variable from holding an Activity." Bug was fixed in a different way."

core/java/android/text/DynamicLayout.java

diff --git a/core/java/android/text/DynamicLayout.java b/core/java/android/text/DynamicLayout.java
index 4f42659..2c78679 100644
--- a/core/java/android/text/DynamicLayout.java
+++ b/core/java/android/text/DynamicLayout.java
@@ -268,11 +268,10 @@
         // generate new layout for affected text
 
         StaticLayout reflowed;
-        WeakReference<StaticLayout> layoutRef;
+
         synchronized (sLock) {
-            layoutRef = sStaticLayoutRef;
-            reflowed = sStaticLayoutRef != null ? sStaticLayoutRef.get() : null;
-            sStaticLayoutRef = null;
+            reflowed = sStaticLayout;
+            sStaticLayout = null;
         }
 
         if (reflowed == null) {
@@ -359,12 +358,8 @@
         }
 
         synchronized (sLock) {
+            sStaticLayout = reflowed;
             reflowed.finish();
-            if (layoutRef == null || layoutRef.get() != reflowed) {
-                sStaticLayoutRef = new WeakReference<StaticLayout>(reflowed);
-            } else {
-                sStaticLayoutRef = layoutRef;
-            }
         }
     }
 
@@ -493,8 +488,7 @@
 
     private int mTopPadding, mBottomPadding;
 
-    private static WeakReference<StaticLayout> sStaticLayoutRef = new WeakReference<StaticLayout>(
-            new StaticLayout(true));
+    private static StaticLayout sStaticLayout = new StaticLayout(true);
     private static final Object[] sLock = new Object[0];
 
     private static final int START = 0;