From 5eb91a437c551ed0c66b38299f988f8159ada207 Mon Sep 17 00:00:00 2001
From: Tony Mantler <nicoya@google.com>
Date: Wed, 28 Sep 2016 13:55:15 -0700
Subject: [PATCH] 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 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/os/AsyncTask.java b/core/java/android/os/AsyncTask.java
index 9a4b599f0e9b6..fea64ec5ee1eb 100644
--- 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);
                 }