Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f83ff96 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix: Concurrent modification exception in sensor manager" into main

parents f4fe6ad4 89de6824

core/java/android/hardware/input/InputDeviceSensorManager.java

+3 −5
Original line number Diff line number Diff line
@@ -280,13 +280,11 @@ public class InputDeviceSensorManager { 
                mSensorEvents.clear();

                return;

            }

            for (Sensor s : mSensors) {

                if (sensorEquals(s, sensor)) {

                    mSensors.remove(sensor);

            boolean removed = mSensors.removeIf(s -> sensorEquals(s, sensor));

            if (removed) {

                mSensorEvents.remove(sensor.getType());

            }

        }

        }



        /**

         * Add a sensor to listener's sensor list