commit 99e23088843eddede29d0fc5ca30a83f147f31b0
author Michael Wright <michaelwr@google.com> Wed Apr 15 11:10:58 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 15 11:10:58 2015 +0000
tree f5495a9edd38cd1bbb4c3b0f59deb974493f0cf0
parent 895f3c27269d14ec53ff3ae8526342f9b57a10e1
parent 150e0e87e1faa01f927cfe8c7110ef843612a1df

am 150e0e87: Merge "fix return value scale of notifyANR()"

* commit '150e0e87e1faa01f927cfe8c7110ef843612a1df':
  fix return value scale of notifyANR()

services/core/java/com/android/server/wm/InputMonitor.java

diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java
index 27ac32a..ad50e05a 100644
--- a/services/core/java/com/android/server/wm/InputMonitor.java
+++ b/services/core/java/com/android/server/wm/InputMonitor.java
@@ -148,7 +148,7 @@
                 if (timeout >= 0) {
                     // The activity manager declined to abort dispatching.
                     // Wait a bit longer and timeout again later.
-                    return timeout;
+                    return timeout * 1000000L; // nanoseconds
                 }
             } catch (RemoteException ex) {
             }