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

Commit 6e22a288 authored by Daniel's avatar Daniel Committed by Daniel Kim
Browse files

Strips spans from AssistStructure text 

When a new view becomes visible on the screen, the view notifies
AutofillManager about its visibility. AutofillManager then requests the
activity to compile an AssistStructure object which will contain the
view hierarchy of the activity as well as texts contained inside all the
views. If there are Span text fields that contain custom implementation of ClickableSpan, these spans are also copied over during the construction of the AssistStructure. By keeping the references to the ClickableSpan, it causes memory leak when the AssistStructure object outlives the activity.

Test: atest CtsAutoFillServiceTestCases, atest CtsAssistTestCases, atest android.widget.cts.TextViewTest
Bug: 146100180
Change-Id: I1fd97d9d6fdc569d14529347fcb85da409c3c1ff
(cherry picked from commit e42d05e3)
parent 90195666

core/java/android/app/assist/AssistStructure.java

+16 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.os.PooledStringWriter; 
import android.os.RemoteException;

import android.os.SystemClock;

import android.service.autofill.FillRequest;

import android.text.Spanned;

import android.text.TextUtils;

import android.util.Log;

import android.util.Pair;
@@ -1557,6 +1558,10 @@ public class AssistStructure implements Parcelable { 
        /**

         * Returns any text associated with the node that is displayed to the user, or null

         * if there is none.

         *

         * <p> The text will be stripped of any spans that could potentially contain reference to

         * the activity context, to avoid memory leak. If the text contained a span, a plain

         * string version of the text will be returned.

         */

        @Nullable

        public CharSequence getText() {
@@ -1996,14 +2001,16 @@ public class AssistStructure implements Parcelable { 
        @Override

        public void setText(CharSequence text) {

            ViewNodeText t = getNodeText();

            t.mText = TextUtils.trimNoCopySpans(text);

            // Strip spans from the text to avoid memory leak

            t.mText = TextUtils.trimToParcelableSize(stripAllSpansFromText(text));

            t.mTextSelectionStart = t.mTextSelectionEnd = -1;

        }



        @Override

        public void setText(CharSequence text, int selectionStart, int selectionEnd) {

            ViewNodeText t = getNodeText();

            t.mText = TextUtils.trimNoCopySpans(text);

            // Strip spans from the text to avoid memory leak

            t.mText = stripAllSpansFromText(text);

            t.mTextSelectionStart = selectionStart;

            t.mTextSelectionEnd = selectionEnd;

        }
@@ -2222,6 +2229,13 @@ public class AssistStructure implements Parcelable { 
        public void setHtmlInfo(@NonNull HtmlInfo htmlInfo) {

            mNode.mHtmlInfo = htmlInfo;

        }



        private CharSequence stripAllSpansFromText(CharSequence text) {

            if (text instanceof Spanned) {

                return text.toString();

            }

            return text;

        }

    }



    private static final class HtmlInfoNode extends HtmlInfo implements Parcelable {