diff options
| author | 2009-10-05 18:28:26 -0400 | |
|---|---|---|
| committer | 2009-10-05 18:28:26 -0400 | |
| commit | 89c768435fc48a93c0af97f9f08e57a346b0a9fd (patch) | |
| tree | 253afbbd5226eec6360613589ce49713f6bd5db4 | |
| parent | 24f32b32f96eab8645a3ccf429c3d5694d2134ad (diff) | |
| parent | 4b057801d5a5a859c2f9a68230744a6b0939ae01 (diff) | |
Merge change I9b771df3 into eclair
* changes:
Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
| -rw-r--r-- | core/java/android/os/AsyncTask.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/os/AsyncTask.java b/core/java/android/os/AsyncTask.java index abfb27412de0..7d2c69889581 100644 --- a/core/java/android/os/AsyncTask.java +++ b/core/java/android/os/AsyncTask.java @@ -413,6 +413,7 @@ public abstract class AsyncTask<Params, Progress, Result> { } private void finish(Result result) { + if (isCancelled()) result = null; onPostExecute(result); mStatus = Status.FINISHED; } |