Remove temporary deprecated methods ContentSuggestionsService.
Bug: 127532182
Test: CTS test
Change-Id: Icc0bc012a5e1a2c85d108a7fa7df481e570cd43a
diff --git a/api/system-current.txt b/api/system-current.txt
index 36680a1..7c66af5 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -6401,14 +6401,10 @@
public abstract class ContentSuggestionsService extends android.app.Service {
ctor public ContentSuggestionsService();
- method @Deprecated public void classifyContentSelections(@NonNull android.app.contentsuggestions.ClassificationsRequest, @NonNull android.app.contentsuggestions.ContentSuggestionsManager.ClassificationsCallback);
- method @Deprecated public void notifyInteraction(@NonNull String, @NonNull android.os.Bundle);
- method public void onClassifyContentSelections(@NonNull android.app.contentsuggestions.ClassificationsRequest, @NonNull android.app.contentsuggestions.ContentSuggestionsManager.ClassificationsCallback);
- method public void onNotifyInteraction(@NonNull String, @NonNull android.os.Bundle);
- method public void onProcessContextImage(int, @Nullable android.graphics.Bitmap, @NonNull android.os.Bundle);
- method public void onSuggestContentSelections(@NonNull android.app.contentsuggestions.SelectionsRequest, @NonNull android.app.contentsuggestions.ContentSuggestionsManager.SelectionsCallback);
- method @Deprecated public void processContextImage(int, @Nullable android.graphics.Bitmap, @NonNull android.os.Bundle);
- method @Deprecated public void suggestContentSelections(@NonNull android.app.contentsuggestions.SelectionsRequest, @NonNull android.app.contentsuggestions.ContentSuggestionsManager.SelectionsCallback);
+ method public abstract void onClassifyContentSelections(@NonNull android.app.contentsuggestions.ClassificationsRequest, @NonNull android.app.contentsuggestions.ContentSuggestionsManager.ClassificationsCallback);
+ method public abstract void onNotifyInteraction(@NonNull String, @NonNull android.os.Bundle);
+ method public abstract void onProcessContextImage(int, @Nullable android.graphics.Bitmap, @NonNull android.os.Bundle);
+ method public abstract void onSuggestContentSelections(@NonNull android.app.contentsuggestions.SelectionsRequest, @NonNull android.app.contentsuggestions.ContentSuggestionsManager.SelectionsCallback);
field public static final String SERVICE_INTERFACE = "android.service.contentsuggestions.ContentSuggestionsService";
}
diff --git a/core/java/android/service/contentsuggestions/ContentSuggestionsService.java b/core/java/android/service/contentsuggestions/ContentSuggestionsService.java
index 516d336..efc8e87 100644
--- a/core/java/android/service/contentsuggestions/ContentSuggestionsService.java
+++ b/core/java/android/service/contentsuggestions/ContentSuggestionsService.java
@@ -127,41 +127,29 @@
* Called by the system to provide the snapshot for the task associated with the given
* {@param taskId}.
*/
- public void onProcessContextImage(
- int taskId, @Nullable Bitmap contextImage, @NonNull Bundle extras) {
- // TODO(b/127532182): remove after next prebuilt drop.
- processContextImage(taskId, contextImage, extras);
- }
+ public abstract void onProcessContextImage(
+ int taskId, @Nullable Bitmap contextImage, @NonNull Bundle extras);
/**
* Content selections have been request through {@link ContentSuggestionsManager}, implementer
* should reply on the callback with selections.
*/
- public void onSuggestContentSelections(@NonNull SelectionsRequest request,
- @NonNull ContentSuggestionsManager.SelectionsCallback callback) {
- // TODO(b/127532182): remove after next prebuilt drop.
- suggestContentSelections(request, callback);
- }
+ public abstract void onSuggestContentSelections(@NonNull SelectionsRequest request,
+ @NonNull ContentSuggestionsManager.SelectionsCallback callback);
/**
* Content classifications have been request through {@link ContentSuggestionsManager},
* implementer should reply on the callback with classifications.
*/
- public void onClassifyContentSelections(@NonNull ClassificationsRequest request,
- @NonNull ContentSuggestionsManager.ClassificationsCallback callback) {
- // TODO(b/127532182): remove after next prebuilt drop.
- classifyContentSelections(request, callback);
- }
+ public abstract void onClassifyContentSelections(@NonNull ClassificationsRequest request,
+ @NonNull ContentSuggestionsManager.ClassificationsCallback callback);
/**
* User interactions have been reported through {@link ContentSuggestionsManager}, implementer
* should handle those interactions.
*/
- public void onNotifyInteraction(
- @NonNull String requestId, @NonNull Bundle interaction) {
- // TODO(b/127532182): remove after next prebuilt drop.
- notifyInteraction(requestId, interaction);
- }
+ public abstract void onNotifyInteraction(
+ @NonNull String requestId, @NonNull Bundle interaction);
private ContentSuggestionsManager.SelectionsCallback wrapSelectionsCallback(
ISelectionsCallback callback) {
@@ -184,42 +172,4 @@
}
});
}
-
-
- /**
- * For temporary compat reason, remove with b/127532182
- * @deprecated use {@link #onProcessContextImage(int, Bitmap, Bundle)} instead.
- */
- @Deprecated
- public void processContextImage(
- int taskId, @Nullable Bitmap contextImage, @NonNull Bundle extras) {
- }
-
- /**
- * For temporary compat reason, remove with b/127532182
- * @deprecated use {@link #onSuggestContentSelections(SelectionsRequest,
- * ContentSuggestionsManager.SelectionsCallback)} instead.
- */
- @Deprecated
- public void suggestContentSelections(@NonNull SelectionsRequest request,
- @NonNull ContentSuggestionsManager.SelectionsCallback callback) {
- }
-
- /**
- * For temporary compat reason, remove with b/127532182
- * @deprecated use {@link #onClassifyContentSelections(ClassificationsRequest,
- * ContentSuggestionsManager.ClassificationsCallback)} instead.
- */
- @Deprecated
- public void classifyContentSelections(@NonNull ClassificationsRequest request,
- @NonNull ContentSuggestionsManager.ClassificationsCallback callback) {
- }
-
- /**
- * For temporary compat reason, remove with b/127532182
- * @deprecated use {@link #onNotifyInteraction(String, Bundle)} instead.
- */
- @Deprecated
- public void notifyInteraction(@NonNull String requestId, @NonNull Bundle interaction) {
- }
}