Merge "Delete DalvikExecTest."
diff --git a/libart/src/main/java/java/lang/Object.java b/libart/src/main/java/java/lang/Object.java
index 9c59870..81e3872 100644
--- a/libart/src/main/java/java/lang/Object.java
+++ b/libart/src/main/java/java/lang/Object.java
@@ -278,10 +278,9 @@
* that called {@code notify()} has to release the object's monitor first.
* Also, the chosen thread still has to compete against other threads that
* try to synchronize on the same object.
- * <p>
- * This method can only be invoked by a thread which owns this object's
+ *
+ * <p>This method can only be invoked by a thread which owns this object's
* monitor. A thread becomes owner of an object's monitor
- * </p>
* <ul>
* <li>by executing a synchronized method of that object;</li>
* <li>by executing the body of a {@code synchronized} statement that
@@ -304,10 +303,9 @@
* will not run immediately. The thread that called {@code notify()} has to
* release the object's monitor first. Also, the threads still have to
* compete against other threads that try to synchronize on the same object.
- * <p>
- * This method can only be invoked by a thread which owns this object's
+ *
+ * <p>This method can only be invoked by a thread which owns this object's
* monitor. A thread becomes owner of an object's monitor
- * </p>
* <ul>
* <li>by executing a synchronized method of that object;</li>
* <li>by executing the body of a {@code synchronized} statement that
@@ -349,23 +347,22 @@
* notify()} or {@code notifyAll()} method of this object. This method can
* only be invoked by a thread which owns this object's monitor; see
* {@link #notify()} on how a thread can become the owner of a monitor.
- * <p>
- * A waiting thread can be sent {@code interrupt()} to cause it to
+ *
+ * <p>A waiting thread can be sent {@code interrupt()} to cause it to
* prematurely stop waiting, so {@code wait} should be called in a loop to
* check that the condition that has been waited for has been met before
* continuing.
- * </p>
- * <p>
- * While the thread waits, it gives up ownership of this object's monitor.
- * When it is notified (or interrupted), it re-acquires the monitor before
- * it starts running.
- * </p>
+ *
+ * <p>While the thread waits, it gives up ownership of this object's
+ * monitor. When it is notified (or interrupted), it re-acquires the monitor
+ * before it starts running.
*
* @throws IllegalMonitorStateException
* if the thread calling this method is not the owner of this
* object's monitor.
- * @throws InterruptedException
- * if another thread interrupts this thread while it is waiting.
+ * @throws InterruptedException if the current thread has been interrupted.
+ * The interrupted status of the current thread will be cleared before the exception
+ * is thrown.
* @see #notify
* @see #notifyAll
* @see #wait(long)
@@ -380,17 +377,18 @@
* specified timeout expires. This method can only be invoked by a thread
* which owns this object's monitor; see {@link #notify()} on how a thread
* can become the owner of a monitor.
- * <p>
- * A waiting thread can be sent {@code interrupt()} to cause it to
+ *
+ * <p>A waiting thread can be sent {@code interrupt()} to cause it to
* prematurely stop waiting, so {@code wait} should be called in a loop to
* check that the condition that has been waited for has been met before
* continuing.
- * </p>
- * <p>
- * While the thread waits, it gives up ownership of this object's monitor.
- * When it is notified (or interrupted), it re-acquires the monitor before
- * it starts running.
- * </p>
+ *
+ * <p>While the thread waits, it gives up ownership of this object's
+ * monitor. When it is notified (or interrupted), it re-acquires the monitor
+ * before it starts running.
+ *
+ * <p>A timeout of zero means the calling thread should wait forever unless interrupted or
+ * notified.
*
* @param millis
* the maximum time to wait in milliseconds.
@@ -399,8 +397,9 @@
* @throws IllegalMonitorStateException
* if the thread calling this method is not the owner of this
* object's monitor.
- * @throws InterruptedException
- * if another thread interrupts this thread while it is waiting.
+ * @throws InterruptedException if the current thread has been interrupted.
+ * The interrupted status of the current thread will be cleared before the exception
+ * is thrown.
* @see #notify
* @see #notifyAll
* @see #wait()
@@ -417,17 +416,18 @@
* specified timeout expires. This method can only be invoked by a thread
* that owns this object's monitor; see {@link #notify()} on how a thread
* can become the owner of a monitor.
- * <p>
- * A waiting thread can be sent {@code interrupt()} to cause it to
+ *
+ * <p>A waiting thread can be sent {@code interrupt()} to cause it to
* prematurely stop waiting, so {@code wait} should be called in a loop to
* check that the condition that has been waited for has been met before
* continuing.
- * </p>
- * <p>
- * While the thread waits, it gives up ownership of this object's monitor.
- * When it is notified (or interrupted), it re-acquires the monitor before
- * it starts running.
- * </p>
+ *
+ * <p>While the thread waits, it gives up ownership of this object's
+ * monitor. When it is notified (or interrupted), it re-acquires the monitor
+ * before it starts running.
+ *
+ * <p>A timeout of zero means the calling thread should wait forever unless interrupted or
+ * notified.
*
* @param millis
* the maximum time to wait in milliseconds.
@@ -440,8 +440,9 @@
* @throws IllegalMonitorStateException
* if the thread calling this method is not the owner of this
* object's monitor.
- * @throws InterruptedException
- * if another thread interrupts this thread while it is waiting.
+ * @throws InterruptedException if the current thread has been interrupted.
+ * The interrupted status of the current thread will be cleared before the exception
+ * is thrown.
* @see #notify
* @see #notifyAll
* @see #wait()
diff --git a/libart/src/main/java/java/lang/Thread.java b/libart/src/main/java/java/lang/Thread.java
index b826e66..852e2cf 100644
--- a/libart/src/main/java/java/lang/Thread.java
+++ b/libart/src/main/java/java/lang/Thread.java
@@ -712,8 +712,9 @@
* Blocks the current Thread (<code>Thread.currentThread()</code>) until
* the receiver finishes its execution and dies.
*
- * @throws InterruptedException if <code>interrupt()</code> was called for
- * the receiver while it was in the <code>join()</code> call
+ * @throws InterruptedException if the current thread has been interrupted.
+ * The interrupted status of the current thread will be cleared before the exception is
+ * thrown.
* @see Object#notifyAll
* @see java.lang.ThreadDeath
*/
@@ -730,9 +731,12 @@
* the receiver finishes its execution and dies or the specified timeout
* expires, whatever happens first.
*
+ * <p>A timeout of zero means the calling thread should wait forever unless interrupted.
+ *
* @param millis The maximum time to wait (in milliseconds).
- * @throws InterruptedException if <code>interrupt()</code> was called for
- * the receiver while it was in the <code>join()</code> call
+ * @throws InterruptedException if the current thread has been interrupted.
+ * The interrupted status of the current thread will be cleared before the exception is
+ * thrown.
* @see Object#notifyAll
* @see java.lang.ThreadDeath
*/
@@ -745,10 +749,13 @@
* the receiver finishes its execution and dies or the specified timeout
* expires, whatever happens first.
*
+ * <p>A timeout of zero means the calling thread should wait forever unless interrupted.
+ *
* @param millis The maximum time to wait (in milliseconds).
* @param nanos Extra nanosecond precision
- * @throws InterruptedException if <code>interrupt()</code> was called for
- * the receiver while it was in the <code>join()</code> call
+ * @throws InterruptedException if the current thread has been interrupted.
+ * The interrupted status of the current thread will be cleared before the exception is
+ * thrown.
* @see Object#notifyAll
* @see java.lang.ThreadDeath
*/
@@ -969,9 +976,9 @@
*
* @param time
* The time to sleep in milliseconds.
- * @throws InterruptedException
- * if <code>interrupt()</code> was called for this Thread while
- * it was sleeping
+ * @throws InterruptedException if the current thread has been interrupted.
+ * The interrupted status of the current thread will be cleared before the exception
+ * is thrown.
* @see Thread#interrupt()
*/
public static void sleep(long time) throws InterruptedException {
@@ -987,9 +994,9 @@
* The time to sleep in milliseconds.
* @param nanos
* Extra nanosecond precision
- * @throws InterruptedException
- * if <code>interrupt()</code> was called for this Thread while
- * it was sleeping
+ * @throws InterruptedException if the current thread has been interrupted.
+ * The interrupted status of the current thread will be cleared before the exception
+ * is thrown.
* @see Thread#interrupt()
*/
public static void sleep(long millis, int nanos) throws InterruptedException {
diff --git a/libdvm/src/main/java/java/lang/Object.java b/libdvm/src/main/java/java/lang/Object.java
index 4bca034..d2cd2f1 100644
--- a/libdvm/src/main/java/java/lang/Object.java
+++ b/libdvm/src/main/java/java/lang/Object.java
@@ -266,10 +266,9 @@
* that called {@code notify()} has to release the object's monitor first.
* Also, the chosen thread still has to compete against other threads that
* try to synchronize on the same object.
- * <p>
- * This method can only be invoked by a thread which owns this object's
+ *
+ * <p>This method can only be invoked by a thread which owns this object's
* monitor. A thread becomes owner of an object's monitor
- * </p>
* <ul>
* <li>by executing a synchronized method of that object;</li>
* <li>by executing the body of a {@code synchronized} statement that
@@ -292,10 +291,9 @@
* will not run immediately. The thread that called {@code notify()} has to
* release the object's monitor first. Also, the threads still have to
* compete against other threads that try to synchronize on the same object.
- * <p>
- * This method can only be invoked by a thread which owns this object's
+ *
+ * <p>This method can only be invoked by a thread which owns this object's
* monitor. A thread becomes owner of an object's monitor
- * </p>
* <ul>
* <li>by executing a synchronized method of that object;</li>
* <li>by executing the body of a {@code synchronized} statement that
@@ -337,23 +335,22 @@
* notify()} or {@code notifyAll()} method of this object. This method can
* only be invoked by a thread which owns this object's monitor; see
* {@link #notify()} on how a thread can become the owner of a monitor.
- * <p>
- * A waiting thread can be sent {@code interrupt()} to cause it to
+ *
+ * <p>A waiting thread can be sent {@code interrupt()} to cause it to
* prematurely stop waiting, so {@code wait} should be called in a loop to
* check that the condition that has been waited for has been met before
* continuing.
- * </p>
- * <p>
- * While the thread waits, it gives up ownership of this object's monitor.
- * When it is notified (or interrupted), it re-acquires the monitor before
- * it starts running.
- * </p>
+ *
+ * <p>While the thread waits, it gives up ownership of this object's
+ * monitor. When it is notified (or interrupted), it re-acquires the monitor
+ * before it starts running.
*
* @throws IllegalMonitorStateException
* if the thread calling this method is not the owner of this
* object's monitor.
- * @throws InterruptedException
- * if another thread interrupts this thread while it is waiting.
+ * @throws InterruptedException if the current thread has been interrupted.
+ * The interrupted status of the current thread will be cleared before the exception
+ * is thrown.
* @see #notify
* @see #notifyAll
* @see #wait(long)
@@ -370,17 +367,18 @@
* specified timeout expires. This method can only be invoked by a thread
* which owns this object's monitor; see {@link #notify()} on how a thread
* can become the owner of a monitor.
- * <p>
- * A waiting thread can be sent {@code interrupt()} to cause it to
+ *
+ * <p>A waiting thread can be sent {@code interrupt()} to cause it to
* prematurely stop waiting, so {@code wait} should be called in a loop to
* check that the condition that has been waited for has been met before
* continuing.
- * </p>
- * <p>
- * While the thread waits, it gives up ownership of this object's monitor.
- * When it is notified (or interrupted), it re-acquires the monitor before
- * it starts running.
- * </p>
+ *
+ * <p>While the thread waits, it gives up ownership of this object's
+ * monitor. When it is notified (or interrupted), it re-acquires the monitor
+ * before it starts running.
+ *
+ * <p>A timeout of zero means the calling thread should wait forever unless interrupted or
+ * notified.
*
* @param millis
* the maximum time to wait in milliseconds.
@@ -389,8 +387,9 @@
* @throws IllegalMonitorStateException
* if the thread calling this method is not the owner of this
* object's monitor.
- * @throws InterruptedException
- * if another thread interrupts this thread while it is waiting.
+ * @throws InterruptedException if the current thread has been interrupted.
+ * The interrupted status of the current thread will be cleared before the exception
+ * is thrown.
* @see #notify
* @see #notifyAll
* @see #wait()
@@ -407,17 +406,18 @@
* specified timeout expires. This method can only be invoked by a thread
* that owns this object's monitor; see {@link #notify()} on how a thread
* can become the owner of a monitor.
- * <p>
- * A waiting thread can be sent {@code interrupt()} to cause it to
+ *
+ * <p>A waiting thread can be sent {@code interrupt()} to cause it to
* prematurely stop waiting, so {@code wait} should be called in a loop to
* check that the condition that has been waited for has been met before
* continuing.
- * </p>
- * <p>
- * While the thread waits, it gives up ownership of this object's monitor.
- * When it is notified (or interrupted), it re-acquires the monitor before
- * it starts running.
- * </p>
+ *
+ * <p>While the thread waits, it gives up ownership of this object's
+ * monitor. When it is notified (or interrupted), it re-acquires the monitor
+ * before it starts running.
+ *
+ * <p>A timeout of zero means the calling thread should wait forever unless interrupted or
+ * notified.
*
* @param millis
* the maximum time to wait in milliseconds.
@@ -430,8 +430,9 @@
* @throws IllegalMonitorStateException
* if the thread calling this method is not the owner of this
* object's monitor.
- * @throws InterruptedException
- * if another thread interrupts this thread while it is waiting.
+ * @throws InterruptedException if the current thread has been interrupted.
+ * The interrupted status of the current thread will be cleared before the exception
+ * is thrown.
* @see #notify
* @see #notifyAll
* @see #wait()
diff --git a/libdvm/src/main/java/java/lang/Thread.java b/libdvm/src/main/java/java/lang/Thread.java
index ee4bdbe..a40dde1 100644
--- a/libdvm/src/main/java/java/lang/Thread.java
+++ b/libdvm/src/main/java/java/lang/Thread.java
@@ -732,8 +732,9 @@
* Blocks the current Thread (<code>Thread.currentThread()</code>) until
* the receiver finishes its execution and dies.
*
- * @throws InterruptedException if <code>interrupt()</code> was called for
- * the receiver while it was in the <code>join()</code> call
+ * @throws InterruptedException if the current thread has been interrupted.
+ * The interrupted status of the current thread will be cleared before the exception is
+ * thrown.
* @see Object#notifyAll
* @see java.lang.ThreadDeath
*/
@@ -755,9 +756,12 @@
* the receiver finishes its execution and dies or the specified timeout
* expires, whatever happens first.
*
+ * <p>A timeout of zero means the calling thread should wait forever unless interrupted.
+ *
* @param millis The maximum time to wait (in milliseconds).
- * @throws InterruptedException if <code>interrupt()</code> was called for
- * the receiver while it was in the <code>join()</code> call
+ * @throws InterruptedException if the current thread has been interrupted.
+ * The interrupted status of the current thread will be cleared before the exception is
+ * thrown.
* @see Object#notifyAll
* @see java.lang.ThreadDeath
*/
@@ -770,10 +774,13 @@
* the receiver finishes its execution and dies or the specified timeout
* expires, whatever happens first.
*
+ * <p>A timeout of zero means the calling thread should wait forever unless interrupted.
+ *
* @param millis The maximum time to wait (in milliseconds).
* @param nanos Extra nanosecond precision
- * @throws InterruptedException if <code>interrupt()</code> was called for
- * the receiver while it was in the <code>join()</code> call
+ * @throws InterruptedException if the current thread has been interrupted.
+ * The interrupted status of the current thread will be cleared before the exception is
+ * thrown.
* @see Object#notifyAll
* @see java.lang.ThreadDeath
*/
@@ -986,9 +993,9 @@
*
* @param time
* The time to sleep in milliseconds.
- * @throws InterruptedException
- * if <code>interrupt()</code> was called for this Thread while
- * it was sleeping
+ * @throws InterruptedException if the current thread has been interrupted.
+ * The interrupted status of the current thread will be cleared before the exception
+ * is thrown.
* @see Thread#interrupt()
*/
public static void sleep(long time) throws InterruptedException {
@@ -1004,9 +1011,9 @@
* The time to sleep in milliseconds.
* @param nanos
* Extra nanosecond precision
- * @throws InterruptedException
- * if <code>interrupt()</code> was called for this Thread while
- * it was sleeping
+ * @throws InterruptedException if the current thread has been interrupted.
+ * The interrupted status of the current thread will be cleared before the exception
+ * is thrown.
* @see Thread#interrupt()
*/
public static void sleep(long millis, int nanos) throws InterruptedException {