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

Commit bd462745 authored by Jacky Kao's avatar Jacky Kao
Browse files

Limitation the text location length of the A11y node 

This issue caused by the input location length is too large to make
the OOM crash when constructing the rectangle array.

Due to the constructed rectangle array needs to send back to services
through the binder transaction, so limiting the text location length
to avoid the binder transaction failure or the OOM crash.

Bug: 159355942
Test: a11y CTS & unit tests
Change-Id: I3b48b8999967347475b830d94d641b45259152ae
parent 624a0f2d

core/api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -50614,6 +50614,7 @@ package android.view.accessibility { 
    field @NonNull public static final android.os.Parcelable.Creator<android.view.accessibility.AccessibilityNodeInfo> CREATOR;

    field @NonNull public static final android.os.Parcelable.Creator<android.view.accessibility.AccessibilityNodeInfo> CREATOR;

    field public static final String EXTRA_DATA_RENDERING_INFO_KEY = "android.view.accessibility.extra.DATA_RENDERING_INFO_KEY";

    field public static final String EXTRA_DATA_RENDERING_INFO_KEY = "android.view.accessibility.extra.DATA_RENDERING_INFO_KEY";

    field public static final String EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH = "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH";

    field public static final String EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH = "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH";

    field public static final int EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_MAX_LENGTH = 20000; // 0x4e20

    field public static final String EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_START_INDEX = "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_ARG_START_INDEX";

    field public static final String EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_START_INDEX = "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_ARG_START_INDEX";

    field public static final String EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY = "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_KEY";

    field public static final String EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY = "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_KEY";

    field public static final int FOCUS_ACCESSIBILITY = 2; // 0x2

    field public static final int FOCUS_ACCESSIBILITY = 2; // 0x2

core/java/android/view/accessibility/AccessibilityNodeInfo.java

+14 −1
Original line number Original line Diff line number Diff line
@@ -627,13 +627,18 @@ public class AccessibilityNodeInfo implements Parcelable { 




    /**

    /**

     * Integer argument specifying the end index of the requested text location data. Must be

     * Integer argument specifying the end index of the requested text location data. Must be

     * positive.

     * positive and no larger than {@link #EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH}.

     *

     *

     * @see #EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY

     * @see #EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY

     */

     */

    public static final String EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH =

    public static final String EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH =

            "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH";

            "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH";





    /**

     * The maximum allowed length of the requested text location data.

     */

    public static final int EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_MAX_LENGTH = 20000;



    /**

    /**

     * Key used to request extra data for the rendering information.

     * Key used to request extra data for the rendering information.

     * The key requests that a {@link AccessibilityNodeInfo.ExtraRenderingInfo} be added to this

     * The key requests that a {@link AccessibilityNodeInfo.ExtraRenderingInfo} be added to this
@@ -1038,6 +1043,14 @@ public class AccessibilityNodeInfo implements Parcelable { 
     * recycled).

     * recycled).

     */

     */

    public boolean refreshWithExtraData(String extraDataKey, Bundle args) {

    public boolean refreshWithExtraData(String extraDataKey, Bundle args) {

        // limits the text location length to make sure the rectangle array allocation avoids

        // the binder transaction failure and OOM crash.

        if (args.getInt(EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH, -1)

                > EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_MAX_LENGTH) {

            args.putInt(EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH,

                    EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_MAX_LENGTH);

        }



        args.putString(EXTRA_DATA_REQUESTED_KEY, extraDataKey);

        args.putString(EXTRA_DATA_REQUESTED_KEY, extraDataKey);

        return refresh(args, true);

        return refresh(args, true);

    }

    }