diff options
author | 2024-08-02 12:53:55 +0000 | |
---|---|---|
committer | 2024-08-02 12:53:55 +0000 | |
commit | 59dda3d6dc685af059d0732a4b46bad801c9fc3f (patch) | |
tree | d88001b13061bce6afca2c4745e996903bedb584 | |
parent | 24eec3bae3142d6217ff5ed02cce1ad7e389531d (diff) | |
parent | 20a7ca2feac22b56ddb0a6e2490faf579f51dfb4 (diff) |
Merge "Fix a concurrent modification in ProximityCheck" into main
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/util/sensors/ProximityCheck.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/util/sensors/ProximityCheck.java b/packages/SystemUI/src/com/android/systemui/util/sensors/ProximityCheck.java index c06a3a1e200c..373417b7bd68 100644 --- a/packages/SystemUI/src/com/android/systemui/util/sensors/ProximityCheck.java +++ b/packages/SystemUI/src/com/android/systemui/util/sensors/ProximityCheck.java @@ -86,11 +86,12 @@ public class ProximityCheck implements Runnable { } private void onProximityEvent(ThresholdSensorEvent proximityEvent) { - mCallbacks.forEach( + List<Consumer<Boolean>> oldCallbacks = mCallbacks; + mCallbacks = new ArrayList<>(); + oldCallbacks.forEach( booleanConsumer -> booleanConsumer.accept( proximityEvent == null ? null : proximityEvent.getBelow())); - mCallbacks.clear(); unregister(); mRegistered.set(false); } |