Merge "Prevent multiple registration of ProximitySensor" into rvc-dev

packages/SystemUI/src/com/android/systemui/util/sensors/ProximitySensor.java

@@ -170,7 +170,11 @@ public class ProximitySensor {
             return false;
         }
 
+        if (mListeners.contains(listener)) {
+            Log.d(TAG, "ProxListener registered multiple times: " + listener);
+        } else {
             mListeners.add(listener);
+        }
         registerInternal();
 
         return true;

packages/SystemUI/tests/src/com/android/systemui/util/sensors/ProximitySensorTest.java

@@ -103,6 +103,30 @@ public class ProximitySensorTest extends SysuiTestCase {
         waitForSensorManager();
     }
 
+    @Test
+    public void testDuplicateListener() {
+        TestableListener listenerA = new TestableListener();
+
+        assertFalse(mProximitySensor.isRegistered());
+
+        mProximitySensor.register(listenerA);
+        waitForSensorManager();
+        assertTrue(mProximitySensor.isRegistered());
+        mProximitySensor.register(listenerA);
+        waitForSensorManager();
+        assertTrue(mProximitySensor.isRegistered());
+        assertNull(listenerA.mLastEvent);
+
+        mFakeProximitySensor.sendProximityResult(true);
+        assertFalse(listenerA.mLastEvent.getNear());
+        assertEquals(listenerA.mCallCount, 1);
+        mFakeProximitySensor.sendProximityResult(false);
+        assertTrue(listenerA.mLastEvent.getNear());
+        assertEquals(listenerA.mCallCount, 2);
+
+        mProximitySensor.unregister(listenerA);
+        waitForSensorManager();
+    }
     @Test
     public void testUnregister() {
         TestableListener listener = new TestableListener();