From 39ccc7e388bb6e5e6972497258750c06d0a4e959 Mon Sep 17 00:00:00 2001 From: Jan Althaus Date: Wed, 4 Apr 2018 13:56:40 +0200 Subject: [PATCH] Makes TCS methods non-abstract This only affects System API Bug: 77563695 Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest Test: bit CtsViewTestCases:android.view.textclassifier.cts.TextClassificationManagerTest Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationTest Test: bit FrameworksCoreTests:android.view.textclassifier.TextSelectionTest Test: bit FrameworksCoreTests:android.view.textclassifier.TextLinksTestBug: Change-Id: Ie927ffe3a4678b7a622c139a5431b89e8f22c6e4 --- api/system-current.txt | 4 ++-- .../service/textclassifier/TextClassifierService.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 1322a39495a32..b6a162fc61609 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4772,8 +4772,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); - 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); 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); diff --git a/core/java/android/service/textclassifier/TextClassifierService.java b/core/java/android/service/textclassifier/TextClassifierService.java index f1bb72cfacf16..6bd7622212f84 100644 --- a/core/java/android/service/textclassifier/TextClassifierService.java +++ b/core/java/android/service/textclassifier/TextClassifierService.java @@ -283,17 +283,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.