commit 150e0e87e1faa01f927cfe8c7110ef843612a1df
author Michael Wright <michaelwr@google.com> Wed Apr 15 10:53:20 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 15 10:53:21 2015 +0000
tree bee4eb3c75de4b4e5dfa1ded399c30eab28679bf
parent 6a47a86112e271d200f77d5ec66f5f50979135ca
parent def340d45e8795128aab98d9d3cc36bcac58710e

Merge "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) {
             }