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

Commit cb40ba28 authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am 89c76843: Merge change I9b771df3 into eclair 

Merge commit '89c76843' into eclair-mr2

* commit '89c76843':
  Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
parents 7d7ab5ae 89c76843

core/java/android/os/AsyncTask.java

+1 −0
Original line number Diff line number Diff line
@@ -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;

    }