Skip to content

Commit 5e7f2d0

Browse files
author
Romain Guy
committed
Revert "Fix the build"
This reverts commit 4db2504.
1 parent 696ba72 commit 5e7f2d0

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

core/java/android/os/AsyncTask.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,6 @@ public Result call() throws Exception {
282282
mTaskInvoked.set(true);
283283

284284
Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
285-
//noinspection unchecked
286285
return postResult(doInBackground(mParams));
287286
}
288287
};
@@ -317,8 +316,12 @@ private void postResultIfNotInvoked(Result result) {
317316
}
318317

319318
private Result postResult(Result result) {
319+
<<<<<<< HEAD
320+
Message message = sHandler.obtainMessage(MESSAGE_POST_RESULT,
321+
=======
320322
@SuppressWarnings({"unchecked"})
321323
Message message = mHandler.obtainMessage(MESSAGE_POST_RESULT,
324+
>>>>>>> 6c0d0b8... Check whether an AsyncTask is created/executed on a looper thread.
322325
new AsyncTaskResult<Result>(this, result));
323326
message.sendToTarget();
324327
return result;

0 commit comments

Comments
 (0)