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

Commit ff835b16 authored by Tony Mak's avatar Tony Mak Committed by android-build-merger
Browse files

Merge "Do not deep copy bundle in getExtras()" into qt-dev 

am: 9214de57

Change-Id: I0280b85953cbeb25394884ed7eb613ead0beceb9
parents f24cca08 9214de57

core/java/android/view/textclassifier/ConversationAction.java

+2 −4
Original line number Diff line number Diff line
@@ -200,13 +200,11 @@ public final class ConversationAction implements Parcelable { 
    /**

     * Returns the extended data related to this conversation action.

     *

     * <p><b>NOTE: </b>Each call to this method returns a new bundle copy so clients should

     * prefer to hold a reference to the returned bundle rather than frequently calling this

     * method.

     * <p><b>NOTE: </b>Do not modify this bundle.

     */

    @NonNull

    public Bundle getExtras() {

        return mExtras.deepCopy();

        return mExtras;

    }



    /** Builder class to construct {@link ConversationAction}. */

core/java/android/view/textclassifier/ConversationActions.java

+2 −4
Original line number Diff line number Diff line
@@ -214,13 +214,11 @@ public final class ConversationActions implements Parcelable { 
        /**

         * Returns the extended data related to this conversation action.

         *

         * <p><b>NOTE: </b>Each call to this method returns a new bundle copy so clients should

         * prefer to hold a reference to the returned bundle rather than frequently calling this

         * method.

         * <p><b>NOTE: </b>Do not modify this bundle.

         */

        @NonNull

        public Bundle getExtras() {

            return mExtras.deepCopy();

            return mExtras;

        }



        /** Builder class to construct a {@link Message} */

core/java/android/view/textclassifier/TextClassification.java

+4 −8
Original line number Diff line number Diff line
@@ -265,13 +265,11 @@ public final class TextClassification implements Parcelable { 
    /**

     * Returns the extended data.

     *

     * <p><b>NOTE: </b>Each call to this method returns a new bundle copy so clients should

     * prefer to hold a reference to the returned bundle rather than frequently calling this

     * method.

     * <p><b>NOTE: </b>Do not modify this bundle.

     */

    @NonNull

    public Bundle getExtras() {

        return mExtras.deepCopy();

        return mExtras;

    }



    @Override
@@ -635,13 +633,11 @@ public final class TextClassification implements Parcelable { 
        /**

         * Returns the extended data.

         *

         * <p><b>NOTE: </b>Each call to this method returns a new bundle copy so clients should

         * prefer to hold a reference to the returned bundle rather than frequently calling this

         * method.

         * <p><b>NOTE: </b>Do not modify this bundle.

         */

        @NonNull

        public Bundle getExtras() {

            return mExtras.deepCopy();

            return mExtras;

        }



        /**

core/java/android/view/textclassifier/TextLinks.java

+4 −8
Original line number Diff line number Diff line
@@ -125,13 +125,11 @@ public final class TextLinks implements Parcelable { 
    /**

     * Returns the extended data.

     *

     * <p><b>NOTE: </b>Each call to this method returns a new bundle copy so clients should

     * prefer to hold a reference to the returned bundle rather than frequently calling this

     * method.

     * <p><b>NOTE: </b>Do not modify this bundle.

     */

    @NonNull

    public Bundle getExtras() {

        return mExtras.deepCopy();

        return mExtras;

    }



    /**
@@ -413,13 +411,11 @@ public final class TextLinks implements Parcelable { 
        /**

         * Returns the extended data.

         *

         * <p><b>NOTE: </b>Each call to this method returns a new bundle copy so clients should

         * prefer to hold a reference to the returned bundle rather than frequently calling this

         * method.

         * <p><b>NOTE: </b>Do not modify this bundle.

         */

        @NonNull

        public Bundle getExtras() {

            return mExtras.deepCopy();

            return mExtras;

        }



        /**

core/java/android/view/textclassifier/TextSelection.java

+4 −8
Original line number Diff line number Diff line
@@ -112,13 +112,11 @@ public final class TextSelection implements Parcelable { 
    /**

     * Returns the extended data.

     *

     * <p><b>NOTE: </b>Each call to this method returns a new bundle copy so clients should

     * prefer to hold a reference to the returned bundle rather than frequently calling this

     * method.

     * <p><b>NOTE: </b>Do not modify this bundle.

     */

    @NonNull

    public Bundle getExtras() {

        return mExtras.deepCopy();

        return mExtras;

    }



    @Override
@@ -296,13 +294,11 @@ public final class TextSelection implements Parcelable { 
        /**

         * Returns the extended data.

         *

         * <p><b>NOTE: </b>Each call to this method returns a new bundle copy so clients should

         * prefer to hold a reference to the returned bundle rather than frequently calling this

         * method.

         * <p><b>NOTE: </b>Do not modify this bundle.

         */

        @NonNull

        public Bundle getExtras() {

            return mExtras.deepCopy();

            return mExtras;

        }



        /**