AsyncTask terminating with exception calls onCancelled

Test: cts/tests/tests/os/src/android/os/cts/AsyncTaskTest.java b/30304893 Change-Id: Icb50cda8026ddd70d457b5e62eb29c81313ee47d
2016-09-28 13:55:15 -07:00
parent cd339f211a
commit 5eb91a437c
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/os/AsyncTask.java
+++ b/core/java/android/os/AsyncTask.java
@@ -304,6 +304,9 @@ public abstract class AsyncTask<Params, Progress, Result> {
                    //noinspection unchecked
                    result = doInBackground(mParams);
                    Binder.flushPendingCommands();
+                } catch (Throwable tr) {
+                    mCancelled.set(true);
+                    throw tr;
                } finally {
                    postResult(result);
                }