Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make APIs abstract once AiAi has implemented them." into sc-dev

Browse Source
This commit is contained in:
Adam He
2021-05-24 21:06:16 +00:00
committed by Android (Google) Code Review
parent e81c22a2c1 a5db52f9ed
commit 102dd28dd0
2 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/system-current.txt
View File

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

26
core/java/android/service/translation/TranslationService.java
View File

@@ -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