commit 069fa7b306ae85763765cd2713e2a2bcd59a44fe
author Jeff Brown <jeffbrown@google.com> Fri Apr 20 13:32:35 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 20 13:32:35 2012 -0700
tree 40371e79f319b2ccd0335bd93f490ade9dfc3875
parent 0a732ad5270ba9fac6bbbff80a7190b739c57c6a
parent 9e6d4b035d4f012d23264d3d2bc946b1ca02dba1

Merge "Lost the race."

core/java/android/hardware/input/InputManager.java

diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java
index b39b823..5ba1850 100755
--- a/core/java/android/hardware/input/InputManager.java
+++ b/core/java/android/hardware/input/InputManager.java
@@ -268,6 +268,8 @@
         synchronized (mInputDevicesLock) {
             int index = findInputDeviceListenerLocked(listener);
             if (index >= 0) {
+                InputDeviceListenerDelegate d = mInputDeviceListeners.get(index);
+                d.removeCallbacksAndMessages(null);
                 mInputDeviceListeners.remove(index);
             }
         }