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

Commit c560af88 authored by Johannes Carlsson's avatar Johannes Carlsson Committed by Steve Kondik
Browse files

Fix memory leak after TextView.setText 

When TextView.setText was called on a TextView that the user
previously touched the mInsertionPointCursorController and
mSelectionModifierCursorController was set to null without first
calling ViewTreeObserver.removeOnTouchModeChangeListener. This caused
the ViewTreeObserver.mOnTouchModeChangeListeners to grow when the
user pressed the updated TextView. In some cases this also lead to a
larger memory leak where the TextView held a reference to a
LinearLayout through mParent.

Change-Id: I8c6042706f259c86e468f828652dc769c83d967c
parent c1ef69cf

core/java/android/widget/TextView.java

+14 −2
Original line number Diff line number Diff line
@@ -6918,15 +6918,27 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                mLayout != null;



        if (!mInsertionControllerEnabled) {

            if (mInsertionPointCursorController != null) {

                final ViewTreeObserver observer = getViewTreeObserver();

                if (observer != null) {

                    observer.removeOnTouchModeChangeListener(mInsertionPointCursorController);

                }

                mInsertionPointCursorController = null;

            }

        }



        if (!mSelectionControllerEnabled) {

            // Stop selection mode if the controller becomes unavailable.

            stopTextSelectionMode();

            if (mSelectionModifierCursorController != null) {

                final ViewTreeObserver observer = getViewTreeObserver();

                if (observer != null) {

                    observer.removeOnTouchModeChangeListener(mSelectionModifierCursorController);

                }

                mSelectionModifierCursorController = null;

            }

        }

    }



    /**

     * @return True iff this TextView contains a text that can be edited.