Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix the build"

Browse Source 
This reverts commit 4db2504ada.
This commit is contained in:
Romain Guy
2011-10-11 18:13:05 -07:00
parent 696ba72729
commit 5e7f2d0b22
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/os/AsyncTask.java
View File

@@ -282,7 +282,6 @@ public abstract class AsyncTask<Params, Progress, Result> {
mTaskInvoked.set(true); mTaskInvoked.set(true);
Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND); Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
//noinspection unchecked
return postResult(doInBackground(mParams)); return postResult(doInBackground(mParams));
} }
}; };
@@ -317,8 +316,12 @@ public abstract class AsyncTask<Params, Progress, Result> {
} }
private Result postResult(Result result) { private Result postResult(Result result) {
<<<<<<< HEAD
Message message = sHandler.obtainMessage(MESSAGE_POST_RESULT,
=======
@SuppressWarnings({"unchecked"}) @SuppressWarnings({"unchecked"})
Message message = mHandler.obtainMessage(MESSAGE_POST_RESULT, Message message = mHandler.obtainMessage(MESSAGE_POST_RESULT,
>>>>>>> 6c0d0b8... Check whether an AsyncTask is created/executed on a looper thread.
new AsyncTaskResult<Result>(this, result)); new AsyncTaskResult<Result>(this, result));
message.sendToTarget(); message.sendToTarget();
return result; return result;