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

Merge "Fix deadlock in BaseDataProducer." into tm-qpr-dev am: 79f8944a5e

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

Change-Id: I64c5e73be510015b64f2526b537ebee1090d62db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Diego Vela
2023-04-28 16:25:53 +00:00
committed by Automerger Merge Worker
parent 531490b7a0 79f8944a5e
commit 010ce0cb31
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/WindowManager/Jetpack/src/androidx/window/common/DeviceStateManagerFoldingFeatureProducer.java
View File

@@ -38,7 +38,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.function.Consumer;
/**
@@ -129,14 +128,13 @@ public final class DeviceStateManagerFoldingFeatureProducer
}
@Override
protected void onListenersChanged(
@NonNull Set<Consumer<List<CommonFoldingFeature>>> callbacks) {
super.onListenersChanged(callbacks);
if (callbacks.isEmpty()) {
protected void onListenersChanged() {
super.onListenersChanged();
if (hasListeners()) {
mRawFoldSupplier.addDataChangedCallback(this::notifyFoldingFeatureChange);
} else {
mCurrentDeviceState = INVALID_DEVICE_STATE;
mRawFoldSupplier.removeDataChangedCallback(this::notifyFoldingFeatureChange);
} else {
mRawFoldSupplier.addDataChangedCallback(this::notifyFoldingFeatureChange);
}
}

9
libs/WindowManager/Jetpack/src/androidx/window/common/RawFoldingFeatureProducer.java
View File

@@ -31,7 +31,6 @@ import androidx.window.util.BaseDataProducer;
import com.android.internal.R;
import java.util.Optional;
import java.util.Set;
import java.util.function.Consumer;
/**
@@ -86,11 +85,11 @@ public final class RawFoldingFeatureProducer extends BaseDataProducer<String> {
}
@Override
protected void onListenersChanged(Set<Consumer<String>> callbacks) {
if (callbacks.isEmpty()) {
unregisterObserversIfNeeded();
} else {
protected void onListenersChanged() {
if (hasListeners()) {
registerObserversIfNeeded();
} else {
unregisterObserversIfNeeded();
}
}

21
libs/WindowManager/Jetpack/src/androidx/window/util/BaseDataProducer.java
View File

@@ -51,10 +51,10 @@ public abstract class BaseDataProducer<T> implements DataProducer<T>,
public final void addDataChangedCallback(@NonNull Consumer<T> callback) {
synchronized (mLock) {
mCallbacks.add(callback);
Optional<T> currentData = getCurrentData();
currentData.ifPresent(callback);
onListenersChanged(mCallbacks);
}
Optional<T> currentData = getCurrentData();
currentData.ifPresent(callback);
onListenersChanged();
}
/**
@@ -67,11 +67,22 @@ public abstract class BaseDataProducer<T> implements DataProducer<T>,
public final void removeDataChangedCallback(@NonNull Consumer<T> callback) {
synchronized (mLock) {
mCallbacks.remove(callback);
onListenersChanged(mCallbacks);
}
onListenersChanged();
}
/**
* Returns {@code true} if there are any registered callbacks {@code false} if there are no
* registered callbacks.
*/
// TODO(b/278132889) Improve the structure of BaseDataProdcuer while avoiding known issues.
public final boolean hasListeners() {
synchronized (mLock) {
return !mCallbacks.isEmpty();
}
}
protected void onListenersChanged(Set<Consumer<T>> callbacks) {}
protected void onListenersChanged() {}
/**
* @return the current data if available and {@code Optional.empty()} otherwise.