From def340d45e8795128aab98d9d3cc36bcac58710e Mon Sep 17 00:00:00 2001 From: "baik.han" Date: Wed, 15 Apr 2015 10:21:05 +0900 Subject: 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 --- services/core/java/com/android/server/wm/InputMonitor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { } -- cgit v1.1