diff options
| author | Michael Wright <michaelwr@google.com> | 2015-04-15 11:10:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-15 11:10:58 +0000 |
| commit | 99e23088843eddede29d0fc5ca30a83f147f31b0 (patch) | |
| tree | f5495a9edd38cd1bbb4c3b0f59deb974493f0cf0 | |
| parent | 895f3c27269d14ec53ff3ae8526342f9b57a10e1 (diff) | |
| parent | 150e0e87e1faa01f927cfe8c7110ef843612a1df (diff) | |
| download | frameworks_base-99e23088843eddede29d0fc5ca30a83f147f31b0.zip frameworks_base-99e23088843eddede29d0fc5ca30a83f147f31b0.tar.gz frameworks_base-99e23088843eddede29d0fc5ca30a83f147f31b0.tar.bz2 | |
am 150e0e87: Merge "fix return value scale of notifyANR()"
* commit '150e0e87e1faa01f927cfe8c7110ef843612a1df':
fix return value scale of notifyANR()
| -rw-r--r-- | services/core/java/com/android/server/wm/InputMonitor.java | 2 |
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) { } |