diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-08 03:19:46 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-08 03:19:46 -0800 |
| commit | 333a40eacb56043cd8fa0e3e1556a0baead1ccf1 (patch) | |
| tree | 9a3d3e3a16ad863d1ad82dee30e89c9dcfa640ea | |
| parent | eaea8131f5dd68e346bd65334bd6aa14595d41e4 (diff) | |
| parent | 6de5831683acc64e2ca5efa61fae6834314d0eb2 (diff) | |
| download | libcore-333a40eacb56043cd8fa0e3e1556a0baead1ccf1.tar.gz libcore-333a40eacb56043cd8fa0e3e1556a0baead1ccf1.tar.bz2 libcore-333a40eacb56043cd8fa0e3e1556a0baead1ccf1.zip | |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/libcore into HEAD
Android 6.0.1 release 3
| -rw-r--r-- | luni/src/main/java/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java | 5 | ||||
| -rw-r--r-- | luni/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java | 5 |
2 files changed, 8 insertions, 2 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 } /** diff --git a/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java b/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java index bfe88e596..8823b6fe6 100644 --- a/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java +++ b/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java @@ -2062,7 +2062,10 @@ public abstract class AbstractQueuedSynchronizer 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 } /** |