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

Commit 8e380a59 authored by Tony Mak's avatar Tony Mak
Browse files

Remove conversation id in ConversationActions 

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

BUG: 126434304

Change-Id: I618adaf22a2b897aaaf6600b310ddec581f2aec7
parent 34b0c44a

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -53615,7 +53615,6 @@ 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 @Nullable public String getConversationId();

    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();
@@ -53628,7 +53627,6 @@ 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 setConversationId(@Nullable String);

    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

+0 −29
Original line number Diff line number Diff line
@@ -318,19 +318,15 @@ public final class ConversationActions implements Parcelable { 
        private final List<String> mHints;

        @Nullable

        private String mCallingPackageName;

        @Nullable

        private final String mConversationId;



        private Request(

                @NonNull List<Message> conversation,

                @NonNull TextClassifier.EntityConfig typeConfig,

                int maxSuggestions,

                String conversationId,

                @Nullable @Hint List<String> hints) {

            mConversation = Preconditions.checkNotNull(conversation);

            mTypeConfig = Preconditions.checkNotNull(typeConfig);

            mMaxSuggestions = maxSuggestions;

            mConversationId = conversationId;

            mHints = hints;

        }
@@ -339,7 +335,6 @@ public final class ConversationActions implements Parcelable { 
            in.readParcelableList(conversation, null);

            TextClassifier.EntityConfig typeConfig = in.readParcelable(null);

            int maxSuggestions = in.readInt();

            String conversationId = in.readString();

            List<String> hints = new ArrayList<>();

            in.readStringList(hints);

            String callingPackageName = in.readString();
@@ -348,7 +343,6 @@ public final class ConversationActions implements Parcelable { 
                    conversation,

                    typeConfig,

                    maxSuggestions,

                    conversationId,

                    hints);

            request.setCallingPackageName(callingPackageName);

            return request;
@@ -359,7 +353,6 @@ public final class ConversationActions implements Parcelable { 
            parcel.writeParcelableList(mConversation, flags);

            parcel.writeParcelable(mTypeConfig, flags);

            parcel.writeInt(mMaxSuggestions);

            parcel.writeString(mConversationId);

            parcel.writeStringList(mHints);

            parcel.writeString(mCallingPackageName);

        }
@@ -403,16 +396,6 @@ public final class ConversationActions implements Parcelable { 
            return mMaxSuggestions;

        }



        /**

         * Return an unique identifier of the conversation that is generating actions for. This

         * identifier is unique within the calling package only, so use it with

         * {@link #getCallingPackageName()}.

         */

        @Nullable

        public String getConversationId() {

            return mConversationId;

        }



        /** Returns an immutable list of hints */

        @Nullable

        @Hint
@@ -448,8 +431,6 @@ public final class ConversationActions implements Parcelable { 
            private TextClassifier.EntityConfig mTypeConfig;

            private int mMaxSuggestions = -1;

            @Nullable

            private String mConversationId;

            @Nullable

            @Hint

            private List<String> mHints;
@@ -490,15 +471,6 @@ public final class ConversationActions implements Parcelable { 
                return this;

            }



            /**

             * Sets an unique identifier of the conversation that is generating actions for.

             */

            @NonNull

            public Builder setConversationId(@Nullable String conversationId) {

                mConversationId = conversationId;

                return this;

            }



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

            @NonNull

            public Request build() {
@@ -508,7 +480,6 @@ public final class ConversationActions implements Parcelable { 
                                ? new TextClassifier.EntityConfig.Builder().build()

                                : mTypeConfig,

                        mMaxSuggestions,

                        mConversationId,

                        mHints == null

                                ? Collections.emptyList()

                                : Collections.unmodifiableList(mHints));