Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78a8e9d2 authored by Tony Mantler's avatar Tony Mantler
Browse files

Fix AsyncTask to handle exceptions in doInBackground 

When cancelling, the exception will be eaten by FutureTask, but
onCancelled would end up never being called due to the exception
causing the code to skip calling postResult.

b/30304893

Change-Id: I47d859d9ef77245889816b2b6e10bb380bc4979b
parent ba8f3d03

core/java/android/os/AsyncTask.java

+10 −6
Original line number Diff line number Diff line
@@ -298,12 +298,16 @@ public abstract class AsyncTask<Params, Progress, Result> { 
        mWorker = new WorkerRunnable<Params, Result>() {

            public Result call() throws Exception {

                mTaskInvoked.set(true);



                Result result = null;

                try {

                    Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);

                    //noinspection unchecked

                Result result = doInBackground(mParams);

                    result = doInBackground(mParams);

                    Binder.flushPendingCommands();

                return postResult(result);

                } finally {

                    postResult(result);

                }

                return result;

            }

        };