Merge cherrypicks of [3851088, 3851089, 3851268, 3850366] into pi-release (385b2edc) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -4759,8 +4759,8 @@ package android.service.textclassifier {
		method public final android.view.textclassifier.TextClassifier getLocalTextClassifier();
		method public final android.os.IBinder onBind(android.content.Intent);
		method public abstract void onClassifyText(android.view.textclassifier.TextClassificationSessionId, android.view.textclassifier.TextClassification.Request, android.os.CancellationSignal, android.service.textclassifier.TextClassifierService.Callback<android.view.textclassifier.TextClassification>);
		method public abstract void onCreateTextClassificationSession(android.view.textclassifier.TextClassificationContext, android.view.textclassifier.TextClassificationSessionId);
		method public abstract void onDestroyTextClassificationSession(android.view.textclassifier.TextClassificationSessionId);
		method public void onCreateTextClassificationSession(android.view.textclassifier.TextClassificationContext, android.view.textclassifier.TextClassificationSessionId);
		method public void onDestroyTextClassificationSession(android.view.textclassifier.TextClassificationSessionId);
		method public abstract void onGenerateLinks(android.view.textclassifier.TextClassificationSessionId, android.view.textclassifier.TextLinks.Request, android.os.CancellationSignal, android.service.textclassifier.TextClassifierService.Callback<android.view.textclassifier.TextLinks>);
		method public void onSelectionEvent(android.view.textclassifier.TextClassificationSessionId, android.view.textclassifier.SelectionEvent);
		method public abstract void onSuggestSelection(android.view.textclassifier.TextClassificationSessionId, android.view.textclassifier.TextSelection.Request, android.os.CancellationSignal, android.service.textclassifier.TextClassifierService.Callback<android.view.textclassifier.TextSelection>);

core/java/android/service/textclassifier/TextClassifierService.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -343,17 +343,17 @@ public abstract class TextClassifierService extends Service {
		* @param context the text classification context
		* @param sessionId the session's Id
		*/
		public abstract void onCreateTextClassificationSession(
		public void onCreateTextClassificationSession(
		@NonNull TextClassificationContext context,
		@NonNull TextClassificationSessionId sessionId);
		@NonNull TextClassificationSessionId sessionId) {}

		/**
		* Destroys the text classification session identified by the specified sessionId.
		*
		* @param sessionId the id of the session to destroy
		*/
		public abstract void onDestroyTextClassificationSession(
		@NonNull TextClassificationSessionId sessionId);
		public void onDestroyTextClassificationSession(
		@NonNull TextClassificationSessionId sessionId) {}

		/**
		* Returns a TextClassifier that runs in this service's process.

core/java/android/view/textclassifier/TextClassifier.java

+32 −22

Original line number	Diff line number	Diff line
		@@ -216,13 +216,17 @@ public interface TextClassifier {
		@IntRange(from = 0) int selectionStartIndex,
		@IntRange(from = 0) int selectionEndIndex,
		@Nullable TextSelection.Options options) {
		final TextSelection.Request request = options.getRequest() != null
		? options.getRequest()
		: new TextSelection.Request.Builder(
		text, selectionStartIndex, selectionEndIndex)
		if (options == null) {
		return suggestSelection(new TextSelection.Request.Builder(
		text, selectionStartIndex, selectionEndIndex).build());
		} else if (options.getRequest() != null) {
		return suggestSelection(options.getRequest());
		} else {
		return suggestSelection(
		new TextSelection.Request.Builder(text, selectionStartIndex, selectionEndIndex)
		.setDefaultLocales(options.getDefaultLocales())
		.build();
		return suggestSelection(request);
		.build());
		}
		}

		/**
		@@ -291,14 +295,17 @@ public interface TextClassifier {
		@IntRange(from = 0) int startIndex,
		@IntRange(from = 0) int endIndex,
		@Nullable TextClassification.Options options) {
		final TextClassification.Request request = options.getRequest() != null
		? options.getRequest()
		: new TextClassification.Request.Builder(
		text, startIndex, endIndex)
		if (options == null) {
		return classifyText(
		new TextClassification.Request.Builder(text, startIndex, endIndex).build());
		} else if (options.getRequest() != null) {
		return classifyText(options.getRequest());
		} else {
		return classifyText(new TextClassification.Request.Builder(text, startIndex, endIndex)
		.setDefaultLocales(options.getDefaultLocales())
		.setReferenceTime(options.getReferenceTime())
		.build();
		return classifyText(request);
		.build());
		}
		}

		/**
		@@ -326,13 +333,16 @@ public interface TextClassifier {
		/** @hide */
		default TextLinks generateLinks(
		@NonNull CharSequence text, @Nullable TextLinks.Options options) {
		final TextLinks.Request request = options.getRequest() != null
		? options.getRequest()
		: new TextLinks.Request.Builder(text)
		if (options == null) {
		return generateLinks(new TextLinks.Request.Builder(text).build());
		} else if (options.getRequest() != null) {
		return generateLinks(options.getRequest());
		} else {
		return generateLinks(new TextLinks.Request.Builder(text)
		.setDefaultLocales(options.getDefaultLocales())
		.setEntityConfig(options.getEntityConfig())
		.build();
		return generateLinks(request);
		.build());
		}
		}

		/**