Merge "Lost the race."

Author: Jeff Brown

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