diff --git a/core/api/system-current.txt b/core/api/system-current.txt index a2a9578b15ce3..aaf371f83421f 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -10416,11 +10416,11 @@ package android.service.translation { ctor public TranslationService(); method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent); method public void onConnected(); - method public void onCreateTranslationSession(@NonNull android.view.translation.TranslationContext, int, @NonNull java.util.function.Consumer); + method public abstract void onCreateTranslationSession(@NonNull android.view.translation.TranslationContext, int, @NonNull java.util.function.Consumer); method public void onDisconnected(); method public abstract void onFinishTranslationSession(int); method public abstract void onTranslationCapabilitiesRequest(int, int, @NonNull java.util.function.Consumer>); - method public void onTranslationRequest(@NonNull android.view.translation.TranslationRequest, int, @Nullable android.os.CancellationSignal, @NonNull java.util.function.Consumer); + method public abstract void onTranslationRequest(@NonNull android.view.translation.TranslationRequest, int, @Nullable android.os.CancellationSignal, @NonNull java.util.function.Consumer); method public final void updateTranslationCapability(@NonNull android.view.translation.TranslationCapability); field public static final String SERVICE_INTERFACE = "android.service.translation.TranslationService"; field public static final String SERVICE_META_DATA = "android.translation_service"; diff --git a/core/java/android/service/translation/TranslationService.java b/core/java/android/service/translation/TranslationService.java index 2f704f46ab74c..e1d4a5656b395 100644 --- a/core/java/android/service/translation/TranslationService.java +++ b/core/java/android/service/translation/TranslationService.java @@ -230,12 +230,8 @@ public abstract class TranslationService extends Service { */ // TODO(b/176464808): the session id won't be unique cross client/server process. Need to find // solution to make it's safe. - // TODO: make abstract once aiai is implemented. - public void onCreateTranslationSession(@NonNull TranslationContext translationContext, - int sessionId, @NonNull Consumer callback) { - onCreateTranslationSession(translationContext, sessionId); - callback.accept(true); - } + public abstract void onCreateTranslationSession(@NonNull TranslationContext translationContext, + int sessionId, @NonNull Consumer callback); /** * TODO: fill in javadoc. @@ -285,23 +281,9 @@ public abstract class TranslationService extends Service { * @param callback * @param cancellationSignal */ - //TODO: make abstract once aiai transitions. - public void onTranslationRequest(@NonNull TranslationRequest request, int sessionId, + public abstract void onTranslationRequest(@NonNull TranslationRequest request, int sessionId, @Nullable CancellationSignal cancellationSignal, - @NonNull Consumer callback) { - onTranslationRequest(request, sessionId, cancellationSignal, - new OnTranslationResultCallback() { - @Override - public void onTranslationSuccess(@NonNull TranslationResponse response) { - callback.accept(response); - } - - @Override - public void onError() { - // null-op - } - }); - } + @NonNull Consumer callback); /** * TODO: fill in javadoc