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

Commit 170f35bc authored by Tony Mak's avatar Tony Mak
Browse files

Add missing set/getExtras to ConversationActions.Request. 

All requests / result objects from TextClassifier have get/setRequest,
so ConversationActions.Request should have them as well.

BUG: 130529981

Test: atest cts/tests/tests/view/src/android/view/textclassifier/cts/ConversationActionsTest.java

Change-Id: I19719b009d4f34df8650c669cc24cb304293407a
parent 094171bc

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -53426,6 +53426,7 @@ package android.view.textclassifier { 
    method public int describeContents();

    method @Nullable public String getCallingPackageName();

    method @NonNull public java.util.List<android.view.textclassifier.ConversationActions.Message> getConversation();

    method @NonNull public android.os.Bundle getExtras();

    method @Nullable public java.util.List<java.lang.String> getHints();

    method @IntRange(from=0xffffffff) public int getMaxSuggestions();

    method @NonNull public android.view.textclassifier.TextClassifier.EntityConfig getTypeConfig();
@@ -53438,6 +53439,7 @@ package android.view.textclassifier { 
  public static final class ConversationActions.Request.Builder {

    ctor public ConversationActions.Request.Builder(@NonNull java.util.List<android.view.textclassifier.ConversationActions.Message>);

    method @NonNull public android.view.textclassifier.ConversationActions.Request build();

    method @NonNull public android.view.textclassifier.ConversationActions.Request.Builder setExtras(@Nullable android.os.Bundle);

    method @NonNull public android.view.textclassifier.ConversationActions.Request.Builder setHints(@Nullable java.util.List<java.lang.String>);

    method @NonNull public android.view.textclassifier.ConversationActions.Request.Builder setMaxSuggestions(@IntRange(from=0xffffffff) int);

    method @NonNull public android.view.textclassifier.ConversationActions.Request.Builder setTypeConfig(@Nullable android.view.textclassifier.TextClassifier.EntityConfig);

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

+30 −4
Original line number Diff line number Diff line
@@ -316,16 +316,20 @@ public final class ConversationActions implements Parcelable { 
        private final List<String> mHints;

        @Nullable

        private String mCallingPackageName;

        @NonNull

        private Bundle mExtras;



        private Request(

                @NonNull List<Message> conversation,

                @NonNull TextClassifier.EntityConfig typeConfig,

                int maxSuggestions,

                @Nullable @Hint List<String> hints) {

                @Nullable @Hint List<String> hints,

                @NonNull Bundle extras) {

            mConversation = Preconditions.checkNotNull(conversation);

            mTypeConfig = Preconditions.checkNotNull(typeConfig);

            mMaxSuggestions = maxSuggestions;

            mHints = hints;

            mExtras = extras;

        }



        private static Request readFromParcel(Parcel in) {
@@ -336,12 +340,13 @@ public final class ConversationActions implements Parcelable { 
            List<String> hints = new ArrayList<>();

            in.readStringList(hints);

            String callingPackageName = in.readString();



            Bundle extras = in.readBundle();

            Request request = new Request(

                    conversation,

                    typeConfig,

                    maxSuggestions,

                    hints);

                    hints,

                    extras);

            request.setCallingPackageName(callingPackageName);

            return request;

        }
@@ -353,6 +358,7 @@ public final class ConversationActions implements Parcelable { 
            parcel.writeInt(mMaxSuggestions);

            parcel.writeStringList(mHints);

            parcel.writeString(mCallingPackageName);

            parcel.writeBundle(mExtras);

        }



        @Override
@@ -421,6 +427,16 @@ public final class ConversationActions implements Parcelable { 
            return mCallingPackageName;

        }



        /**

         * Returns the extended data related to this request.

         *

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

         */

        @NonNull

        public Bundle getExtras() {

            return mExtras;

        }



        /** Builder object to construct the {@link Request} object. */

        public static final class Builder {

            @NonNull
@@ -431,6 +447,8 @@ public final class ConversationActions implements Parcelable { 
            @Nullable

            @Hint

            private List<String> mHints;

            @Nullable

            private Bundle mExtras;



            /**

             * Constructs a builder.
@@ -469,6 +487,13 @@ public final class ConversationActions implements Parcelable { 
                return this;

            }



            /** Sets a set of extended data to the request. */

            @NonNull

            public Builder setExtras(@Nullable Bundle bundle) {

                mExtras = bundle;

                return this;

            }



            /** Builds the {@link Request} object. */

            @NonNull

            public Request build() {
@@ -480,7 +505,8 @@ public final class ConversationActions implements Parcelable { 
                        mMaxSuggestions,

                        mHints == null

                                ? Collections.emptyList()

                                : Collections.unmodifiableList(mHints));

                                : Collections.unmodifiableList(mHints),

                        mExtras == null ? Bundle.EMPTY : mExtras);

            }

        }

    }