summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbaik.han <baik.han@lge.com>2015-04-15 10:21:05 +0900
committerbaik.han <baik.han@lge.com>2015-04-15 10:21:05 +0900
commitdef340d45e8795128aab98d9d3cc36bcac58710e (patch)
tree1a2775df155edf9155431c743b6cb828b750acf7
parent82992b7270842637d1af3dcc7c9ae954bdfa312c (diff)
downloadframeworks_base-def340d45e8795128aab98d9d3cc36bcac58710e.zip
frameworks_base-def340d45e8795128aab98d9d3cc36bcac58710e.tar.gz
frameworks_base-def340d45e8795128aab98d9d3cc36bcac58710e.tar.bz2
fix return value scale of notifyANR()
fix return value scale of notifyANR() from milliseconds to nanoseconds when windowState is not null This prevent unintended frequent method calls of notifyANR() in a very short time. Change-Id: Icc1f363b3ed3538821a42c080809567473bfb833 Signed-off-by: Baik Han <baik.han@lge.com>
-rw-r--r--services/core/java/com/android/server/wm/InputMonitor.java2
1 files changed, 1 insertions, 1 deletions
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 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {
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) {
}