summaryrefslogtreecommitdiffstats
path: root/core/java/android/os
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2009-10-05 14:48:04 -0700
committerRomain Guy <romainguy@android.com>2009-10-05 14:48:04 -0700
commit4b057801d5a5a859c2f9a68230744a6b0939ae01 (patch)
treee943719ca98cfb2e1ccf97084a0022bb6c24597e /core/java/android/os
parentf7ae77cd67f1a3993b8e56c1af4720a7adf4e69d (diff)
downloadframeworks_base-4b057801d5a5a859c2f9a68230744a6b0939ae01.zip
frameworks_base-4b057801d5a5a859c2f9a68230744a6b0939ae01.tar.gz
frameworks_base-4b057801d5a5a859c2f9a68230744a6b0939ae01.tar.bz2
Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
This is in accordance to the documentation. This bug was approved by hackbod. The change is safe and is a single line of code. Change-Id: I9b771df3ae2aa4f496d15e6c43b677f3245539ac
Diffstat (limited to 'core/java/android/os')
-rw-r--r--core/java/android/os/AsyncTask.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/os/AsyncTask.java b/core/java/android/os/AsyncTask.java
index abfb274..7d2c698 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;
}