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

Commit 4db2504a authored by Romain Guy's avatar Romain Guy
Browse files

Fix the build 

Change-Id: I3071feab62abee7393557ceb920786b476fb0b02
parent 7498ccb6

core/java/android/os/AsyncTask.java

+1 −4
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ public abstract class AsyncTask<Params, Progress, Result> { 
                mTaskInvoked.set(true);



                Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);

                //noinspection unchecked

                return postResult(doInBackground(mParams));

            }

        };
@@ -316,12 +317,8 @@ public abstract class AsyncTask<Params, Progress, Result> { 
    }



    private Result postResult(Result result) {

<<<<<<< HEAD

        Message message = sHandler.obtainMessage(MESSAGE_POST_RESULT,

=======

        @SuppressWarnings({"unchecked"})

        Message message = mHandler.obtainMessage(MESSAGE_POST_RESULT,

>>>>>>> 6c0d0b8... Check whether an AsyncTask is created/executed on a looper thread.

                new AsyncTaskResult<Result>(this, result));

        message.sendToTarget();

        return result;