diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-06-05 13:21:05 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-06-05 16:16:38 -0700 |
| commit | 3b532d744034b43ed329a3198f15846d80fec3f0 (patch) | |
| tree | 05195156ad2d516396d88c8356d4fc9916c089f1 /runtime/base | |
| parent | 7fabaa6ba1927d21a317c03499b705cbde4f6a47 (diff) | |
| download | art-3b532d744034b43ed329a3198f15846d80fec3f0.tar.gz art-3b532d744034b43ed329a3198f15846d80fec3f0.tar.bz2 art-3b532d744034b43ed329a3198f15846d80fec3f0.zip | |
Use runFinalizationWithTimeout for native allocations
Prevents deadlocks by not waiting longer than 250ms for finalizers
to complete.
Bug: 21544853
Change-Id: I57b2f7ae8b74185922eb3c15ba0ab71a4d2348aa
Diffstat (limited to 'runtime/base')
| -rw-r--r-- | runtime/base/time_utils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/base/time_utils.h b/runtime/base/time_utils.h index f58c22a7cc..55d2764576 100644 --- a/runtime/base/time_utils.h +++ b/runtime/base/time_utils.h @@ -68,8 +68,8 @@ static constexpr inline uint64_t NsToMs(uint64_t ns) { } // Converts the given number of milliseconds to nanoseconds -static constexpr inline uint64_t MsToNs(uint64_t ns) { - return ns * 1000 * 1000; +static constexpr inline uint64_t MsToNs(uint64_t ms) { + return ms * 1000 * 1000; } #if defined(__APPLE__) |