Merge "Required change for the new model drop" (205b9ffd) · Commits · e / os / android_frameworks_base

core/java/android/view/textclassifier/ActionsSuggestionsHelper.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -76,7 +76,9 @@ public final class ActionsSuggestionsHelper {
		return new ActionsSuggestionsModel.ConversationMessage[]{
		new ActionsSuggestionsModel.ConversationMessage(
		FIRST_NON_LOCAL_USER,
		lastMessage.getText().toString())};
		lastMessage.getText().toString(),
		0,
		null)};
		}

		// Encode the messages in the reverse order, stop whenever the Person object is missing.
		@@ -89,7 +91,7 @@ public final class ActionsSuggestionsHelper {
		}
		nativeMessages.push(new ActionsSuggestionsModel.ConversationMessage(
		personEncoder.encode(message.getAuthor()),
		message.getText().toString()));
		message.getText().toString(), 0, null));
		}
		return nativeMessages.toArray(
		new ActionsSuggestionsModel.ConversationMessage[nativeMessages.size()]);

+1 −1

Original line number	Diff line number	Diff line
		@@ -373,7 +373,7 @@ public class TextClassifierTest {
		public void testSuggestConversationActions_textReplyOnly_maxThree() {
		if (isTextClassifierDisabled()) return;
		ConversationActions.Message message =
		new ConversationActions.Message.Builder().setText("Hello").build();
		new ConversationActions.Message.Builder().setText("Where are you?").build();
		ConversationActions.TypeConfig typeConfig =
		new ConversationActions.TypeConfig.Builder().includeTypesFromTextClassifier(false)
		.setIncludedTypes(