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

Fix the Translator references are gone when receiving response.

Browse Source 
There are some issues TranslationService already sent the response
but the View onResponse doesn't be called. The reference seems to be
gone. If we don't fix the problem, we will missing the ui translation
even the service already give us the response. To fix the problem, we
change it to strong reference.

The change is low risk, the only risk is if TranslationService doesn
not release the reference to the callback properly causing a memory
leak for apps but this can recovered by app update.

Bug: 194973014
Test: atest CtsTranslationTestCases
Test: The translation for chat apps work fine. The memory is decreased
after receiving the responses for a while.

Change-Id: Ib3956b2250c54a29acf9f7d51f51e8191fe8aba2
This commit is contained in:
Joanne Chung
2021-07-30 21:19:14 +08:00
parent 5528d08a4f
commit fd19460694
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);
}
}
}