diff options
| author | Romain Guy <romainguy@google.com> | 2012-10-17 14:36:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-17 14:36:18 -0700 |
| commit | 3301654a541b5743b6538ce1e161c35330673949 (patch) | |
| tree | a77624ecc4bb5a540963491a1c266109874469e4 /core | |
| parent | 1720e0735576b4f0e8e8cf6faf2c813b4320a21b (diff) | |
| parent | 6f931ccd31bc0a8a402072c1d87e682c8a30a404 (diff) | |
| download | frameworks_base-3301654a541b5743b6538ce1e161c35330673949.zip frameworks_base-3301654a541b5743b6538ce1e161c35330673949.tar.gz frameworks_base-3301654a541b5743b6538ce1e161c35330673949.tar.bz2 | |
Merge "Fix javadoc" into jb-mr1-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/os/AsyncTask.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/AsyncTask.java b/core/java/android/os/AsyncTask.java index 69e1de9..ce5f163 100644 --- a/core/java/android/os/AsyncTask.java +++ b/core/java/android/os/AsyncTask.java @@ -110,7 +110,7 @@ import java.util.concurrent.atomic.AtomicInteger; * <h2>The 4 steps</h2> * <p>When an asynchronous task is executed, the task goes through 4 steps:</p> * <ol> - * <li>{@link #onPreExecute()}, invoked on the UI thread immediately after the task + * <li>{@link #onPreExecute()}, invoked on the UI thread before the task * is executed. This step is normally used to setup the task, for instance by * showing a progress bar in the user interface.</li> * <li>{@link #doInBackground}, invoked on the background thread |