summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/os/AsyncTask.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/core/java/android/os/AsyncTask.java b/core/java/android/os/AsyncTask.java
index 1990935ff061..70ec0af4064c 100644
--- a/core/java/android/os/AsyncTask.java
+++ b/core/java/android/os/AsyncTask.java
@@ -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;