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);
     }