Lost the race.

Jeff Brown · Jeff Brown · commit 9e6d4b035d4f · 2012-04-20T13:08:27.000-07:00
Bug: 6373370
Change-Id: If42a3de66b1d407b06064e91ff578dc9ca5ceed8
diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java
@@ -268,6 +268,8 @@ public void unregisterInputDeviceListener(InputDeviceListener listener) {
         synchronized (mInputDevicesLock) {
             int index = findInputDeviceListenerLocked(listener);
             if (index >= 0) {
+                InputDeviceListenerDelegate d = mInputDeviceListeners.get(index);
+                d.removeCallbacksAndMessages(null);
                 mInputDeviceListeners.remove(index);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -268,6 +268,8 @@ public void unregisterInputDeviceListener(InputDeviceListener listener) {`
`268`	`268`	`synchronized (mInputDevicesLock) {`
`269`	`269`	`int index = findInputDeviceListenerLocked(listener);`
`270`	`270`	`if (index >= 0) {`
	`271`	`+ InputDeviceListenerDelegate d = mInputDeviceListeners.get(index);`
	`272`	`+ d.removeCallbacksAndMessages(null);`
`271`	`273`	`mInputDeviceListeners.remove(index);`
`272`	`274`	`}`
`273`	`275`	`}`