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

Merge "Remove weak reference to prevent loss of callback"

Browse Source
This commit is contained in:
Mark Renouf
2021-09-29 13:34:40 +00:00
committed by Android (Google) Code Review
parent 86ab48b6c1 3cdbefc6f3
commit 508008be17
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/android/view/ScrollCaptureConnection.java
View File

@@ -33,8 +33,8 @@ import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import java.lang.ref.Reference;
import java.lang.ref.WeakReference;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
/**
@@ -231,31 +231,24 @@ public class ScrollCaptureConnection extends IScrollCaptureConnection.Stub {
private static class SafeCallback<T> {
private final CancellationSignal mSignal;
private final WeakReference<T> mTargetRef;
private final Executor mExecutor;
private boolean mExecuted;
private final AtomicReference<T> mValue;
protected SafeCallback(CancellationSignal signal, Executor executor, T target) {
protected SafeCallback(CancellationSignal signal, Executor executor, T value) {
mSignal = signal;
mTargetRef = new WeakReference<>(target);
mValue = new AtomicReference<T>(value);
mExecutor = executor;
}
// Provide the target to the consumer to invoke, forward on handler thread ONCE,
// and only if noy cancelled, and the target is still available (not collected)
protected final void maybeAccept(Consumer<T> targetConsumer) {
if (mExecuted) {
return;
}
mExecuted = true;
// Provide the value to the consumer to accept only once.
protected final void maybeAccept(Consumer<T> consumer) {
T value = mValue.getAndSet(null);
if (mSignal.isCanceled()) {
return;
}
T target = mTargetRef.get();
if (target == null) {
return;
if (value != null) {
mExecutor.execute(() -> consumer.accept(value));
}
mExecutor.execute(() -> targetConsumer.accept(target));
}
static Runnable create(CancellationSignal signal, Executor executor, Runnable target) {