Merge "Introduce a TextClassifierManagerService." (8420d5e5) · Commits · e / os / android_frameworks_base

Android.bp

+4 −0

Original line number	Diff line number	Diff line
		@@ -319,6 +319,10 @@ java_library {
		"core/java/android/service/chooser/IChooserTargetResult.aidl",
		"core/java/android/service/resolver/IResolverRankerService.aidl",
		"core/java/android/service/resolver/IResolverRankerResult.aidl",
		"core/java/android/service/textclassifier/ITextClassificationCallback.aidl",
		"core/java/android/service/textclassifier/ITextClassifierService.aidl",
		"core/java/android/service/textclassifier/ITextLinksCallback.aidl",
		"core/java/android/service/textclassifier/ITextSelectionCallback.aidl",
		"core/java/android/view/accessibility/IAccessibilityInteractionConnection.aidl",
		"core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl",
		"core/java/android/view/accessibility/IAccessibilityManager.aidl",

api/current.txt

+8 −2

Original line number	Diff line number	Diff line
		@@ -50039,7 +50039,8 @@ package android.view.inputmethod {

		package android.view.textclassifier {

		public final class TextClassification {
		public final class TextClassification implements android.os.Parcelable {
		method public int describeContents();
		method public float getConfidenceScore(java.lang.String);
		method public java.lang.String getEntity(int);
		method public int getEntityCount();
		@@ -50053,6 +50054,8 @@ package android.view.textclassifier {
		method public java.lang.CharSequence getSecondaryLabel(int);
		method public java.lang.String getSignature();
		method public java.lang.String getText();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.view.textclassifier.TextClassification> CREATOR;
		}

		public static final class TextClassification.Builder {
		@@ -50158,13 +50161,16 @@ package android.view.textclassifier {
		field public static final android.os.Parcelable.Creator<android.view.textclassifier.TextLinks.TextLink> CREATOR;
		}

		public final class TextSelection {
		public final class TextSelection implements android.os.Parcelable {
		method public int describeContents();
		method public float getConfidenceScore(java.lang.String);
		method public java.lang.String getEntity(int);
		method public int getEntityCount();
		method public int getSelectionEndIndex();
		method public int getSelectionStartIndex();
		method public java.lang.String getSignature();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.view.textclassifier.TextSelection> CREATOR;
		}

		public static final class TextSelection.Builder {

api/system-current.txt

+19 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ package android {
		field public static final java.lang.String BIND_RESOLVER_RANKER_SERVICE = "android.permission.BIND_RESOLVER_RANKER_SERVICE";
		field public static final java.lang.String BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE = "android.permission.BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE";
		field public static final java.lang.String BIND_SETTINGS_SUGGESTIONS_SERVICE = "android.permission.BIND_SETTINGS_SUGGESTIONS_SERVICE";
		field public static final java.lang.String BIND_TEXTCLASSIFIER_SERVICE = "android.permission.BIND_TEXTCLASSIFIER_SERVICE";
		field public static final java.lang.String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT";
		field public static final java.lang.String BIND_TV_REMOTE_SERVICE = "android.permission.BIND_TV_REMOTE_SERVICE";
		field public static final java.lang.String BLUETOOTH_PRIVILEGED = "android.permission.BLUETOOTH_PRIVILEGED";
		@@ -4464,6 +4465,24 @@ package android.service.settings.suggestions {

		}

		package android.service.textclassifier {

		public abstract class TextClassifierService extends android.app.Service {
		ctor public TextClassifierService();
		method public final android.os.IBinder onBind(android.content.Intent);
		method public abstract void onClassifyText(java.lang.CharSequence, int, int, android.view.textclassifier.TextClassification.Options, android.os.CancellationSignal, android.service.textclassifier.TextClassifierService.Callback<android.view.textclassifier.TextClassification>);
		method public abstract void onGenerateLinks(java.lang.CharSequence, android.view.textclassifier.TextLinks.Options, android.os.CancellationSignal, android.service.textclassifier.TextClassifierService.Callback<android.view.textclassifier.TextLinks>);
		method public abstract void onSuggestSelection(java.lang.CharSequence, int, int, android.view.textclassifier.TextSelection.Options, android.os.CancellationSignal, android.service.textclassifier.TextClassifierService.Callback<android.view.textclassifier.TextSelection>);
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.textclassifier.TextClassifierService";
		}

		public static abstract interface TextClassifierService.Callback<T> {
		method public abstract void onFailure(java.lang.CharSequence);
		method public abstract void onSuccess(T);
		}

		}

		package android.service.trust {

		public class TrustAgentService extends android.app.Service {

core/java/android/service/textclassifier/ITextClassificationCallback.aidl

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.service.textclassifier;

		import android.view.textclassifier.TextClassification;

		/**
		* Callback for a TextClassification request.
		* @hide
		*/
		oneway interface ITextClassificationCallback {
		void onSuccess(in TextClassification classification);
		void onFailure();
		}

core/java/android/service/textclassifier/ITextClassifierService.aidl

0 → 100644

+47 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.service.textclassifier;

		import android.service.textclassifier.ITextClassificationCallback;
		import android.service.textclassifier.ITextLinksCallback;
		import android.service.textclassifier.ITextSelectionCallback;
		import android.view.textclassifier.TextClassification;
		import android.view.textclassifier.TextLinks;
		import android.view.textclassifier.TextSelection;

		/**
		* TextClassifierService binder interface.
		* See TextClassifier for interface documentation.
		* {@hide}
		*/
		oneway interface ITextClassifierService {

		void onSuggestSelection(
		in CharSequence text, int selectionStartIndex, int selectionEndIndex,
		in TextSelection.Options options,
		in ITextSelectionCallback c);

		void onClassifyText(
		in CharSequence text, int startIndex, int endIndex,
		in TextClassification.Options options,
		in ITextClassificationCallback c);

		void onGenerateLinks(
		in CharSequence text,
		in TextLinks.Options options,
		in ITextLinksCallback c);
		}