diff options
Diffstat (limited to 'luni/src/main/java/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java')
| -rw-r--r-- | luni/src/main/java/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java b/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java index 47a02a9e4..a74fb2469 100644 --- a/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java +++ b/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java @@ -1838,7 +1838,10 @@ public abstract class AbstractQueuedLongSynchronizer if (interruptMode != 0) reportInterruptAfterWait(interruptMode); long remaining = deadline - System.nanoTime(); // avoid overflow - return (remaining < initialNanos) ? remaining : Long.MIN_VALUE; + // BEGIN android-note Changed from < to <= http://b/24284239 + // return (remaining < initialNanos) ? remaining : Long.MIN_VALUE; + return (remaining <= initialNanos) ? remaining : Long.MIN_VALUE; + // END android-note } /** |