Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8eb34ed8 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #5344067 android.text.DynamicLayout.sStaticLayout can hold onto... 

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

core/java/android/text/DynamicLayout.java

+2 −2
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ extends Layout 
        }



        if (reflowed == null) {

            reflowed = new StaticLayout(getText());

            reflowed = new StaticLayout(null);

        } else {

            reflowed.prepare();

        }
@@ -488,7 +488,7 @@ extends Layout 


    private int mTopPadding, mBottomPadding;



    private static StaticLayout sStaticLayout = null;

    private static StaticLayout sStaticLayout = new StaticLayout(null);



    private static final Object[] sLock = new Object[0];