Merge "Sensors could be disabled by any application"

2012-10-24 16:29:06 -07:00
parent 86e0d95de1 6d7a473764
commit 7e007ff837
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/hardware/SystemSensorManager.java
+++ b/core/java/android/hardware/SystemSensorManager.java
@@ -373,7 +373,8 @@ public class SystemSensorManager extends SensorManager {
                        for (Sensor s : l.getSensors()) {
                            disableSensorLocked(s);
                        }
-                    } else if (l.removeSensor(sensor) == 0) {
+                    // Check if the ListenerDelegate has the sensor it is trying to unregister.
+                    } else if (l.hasSensor(sensor) && l.removeSensor(sensor) == 0) {
                        // if we have no more sensors enabled on this listener,
                        // take it off the list.
                        sListeners.remove(i);