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

Merge "Fix the Translator references are gone when receiving response." into sc-dev am: 9d17b85ce7 am: fb94c27386

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

Change-Id: Ib5ba66d50444906511b6acb32c6952537f6923bd
This commit is contained in:
Joanne Chung
2021-08-05 14:05:55 +00:00
committed by Automerger Merge Worker
parent 19f6023856 fb94c27386
commit 1aa6648c67
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/android/view/translation/Translator.java
View File

@@ -18,6 +18,7 @@ package android.view.translation;
import static android.view.translation.TranslationManager.STATUS_SYNC_CALL_FAIL;
import static android.view.translation.TranslationManager.SYNC_CALLS_TIMEOUT_MS;
import static android.view.translation.UiTranslationController.DEBUG;
import android.annotation.CallbackExecutor;
import android.annotation.NonNull;
@@ -38,7 +39,6 @@ import com.android.internal.annotations.GuardedBy;
import com.android.internal.os.IResultReceiver;
import java.io.PrintWriter;
import java.lang.ref.WeakReference;
import java.util.Objects;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
@@ -395,27 +395,26 @@ public class Translator {
private static class TranslationResponseCallbackImpl extends ITranslationCallback.Stub {
private final WeakReference<Consumer<TranslationResponse>> mCallback;
private final WeakReference<Executor> mExecutor;
private final Consumer<TranslationResponse> mCallback;
private final Executor mExecutor;
TranslationResponseCallbackImpl(Consumer<TranslationResponse> callback, Executor executor) {
mCallback = new WeakReference<>(callback);
mExecutor = new WeakReference<>(executor);
mCallback = callback;
mExecutor = executor;
}
@Override
public void onTranslationResponse(TranslationResponse response) throws RemoteException {
final Consumer<TranslationResponse> callback = mCallback.get();
if (DEBUG) {
Log.i(TAG, "onTranslationResponse called.");
}
final Runnable runnable =
() -> callback.accept(response);
if (callback != null) {
final Executor executor = mExecutor.get();
final long token = Binder.clearCallingIdentity();
try {
executor.execute(runnable);
} finally {
restoreCallingIdentity(token);
}
() -> mCallback.accept(response);
final long token = Binder.clearCallingIdentity();
try {
mExecutor.execute(runnable);
} finally {
restoreCallingIdentity(token);
}
}
}