commit 5eb91a437c551ed0c66b38299f988f8159ada207
author Tony Mantler <nicoya@google.com> Wed Sep 28 13:55:15 2016 -0700
committer Tony Mantler <nicoya@google.com> Wed Sep 28 21:16:56 2016 +0000
tree 6b680ce8058f71376e49626356a5a99f3c2e330c
parent cd339f211ae976d0ffeaffcceb178b45804556a9

AsyncTask terminating with exception calls onCancelled

Test: cts/tests/tests/os/src/android/os/cts/AsyncTaskTest.java
b/30304893

Change-Id: Icb50cda8026ddd70d457b5e62eb29c81313ee47d

core/java/android/os/AsyncTask.java

diff --git a/core/java/android/os/AsyncTask.java b/core/java/android/os/AsyncTask.java
index 9a4b599..fea64ec 100644
--- a/core/java/android/os/AsyncTask.java
+++ b/core/java/android/os/AsyncTask.java
@@ -304,6 +304,9 @@
                     //noinspection unchecked
                     result = doInBackground(mParams);
                     Binder.flushPendingCommands();
+                } catch (Throwable tr) {
+                    mCancelled.set(true);
+                    throw tr;
                 } finally {
                     postResult(result);
                 }