Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f58ee5ea authored by Adam He's avatar Adam He Committed by Automerger Merge Worker
Browse files

Merge "Make APIs abstract once AiAi has implemented them." into sc-dev am: 102dd28d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14631836

Change-Id: I59cd1fe6205ed0fa4e4bc8349e98ddd2eb6696ec
parents c79d07b3 102dd28d

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -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<java.lang.Boolean>);

    method public abstract void onCreateTranslationSession(@NonNull android.view.translation.TranslationContext, int, @NonNull java.util.function.Consumer<java.lang.Boolean>);

    method public void onDisconnected();

    method public abstract void onFinishTranslationSession(int);

    method public abstract void onTranslationCapabilitiesRequest(int, int, @NonNull java.util.function.Consumer<java.util.Set<android.view.translation.TranslationCapability>>);

    method public void onTranslationRequest(@NonNull android.view.translation.TranslationRequest, int, @Nullable android.os.CancellationSignal, @NonNull java.util.function.Consumer<android.view.translation.TranslationResponse>);

    method public abstract void onTranslationRequest(@NonNull android.view.translation.TranslationRequest, int, @Nullable android.os.CancellationSignal, @NonNull java.util.function.Consumer<android.view.translation.TranslationResponse>);

    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";

core/java/android/service/translation/TranslationService.java

+4 −22
Original line number Diff line number Diff line
@@ -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<Boolean> callback) {

        onCreateTranslationSession(translationContext, sessionId);

        callback.accept(true);

    }

    public abstract void onCreateTranslationSession(@NonNull TranslationContext translationContext,

            int sessionId, @NonNull Consumer<Boolean> 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<TranslationResponse> 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<TranslationResponse> callback);



    /**

     * TODO: fill in javadoc