diff options
| author | Romain Guy <romainguy@google.com> | 2011-10-11 18:13:05 -0700 |
|---|---|---|
| committer | Romain Guy <romainguy@google.com> | 2011-10-11 18:13:05 -0700 |
| commit | 5e7f2d0b227df38f6dbc2313ac8b5c9f225c135e (patch) | |
| tree | 3525bcf2485a2b967cd92a4586b98a5976c1999a /core/java/android/os | |
| parent | 696ba72729067b2ec6aace568c43ec77ebd0b849 (diff) | |
| download | frameworks_base-5e7f2d0b227df38f6dbc2313ac8b5c9f225c135e.zip frameworks_base-5e7f2d0b227df38f6dbc2313ac8b5c9f225c135e.tar.gz frameworks_base-5e7f2d0b227df38f6dbc2313ac8b5c9f225c135e.tar.bz2 | |
Revert "Fix the build"
This reverts commit 4db2504adab21e4439c123d2675db555e0143afa.
Diffstat (limited to 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/AsyncTask.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/os/AsyncTask.java b/core/java/android/os/AsyncTask.java index 70ec0af..1990935 100644 --- a/core/java/android/os/AsyncTask.java +++ b/core/java/android/os/AsyncTask.java @@ -282,7 +282,6 @@ public abstract class AsyncTask<Params, Progress, Result> { mTaskInvoked.set(true); Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND); - //noinspection unchecked return postResult(doInBackground(mParams)); } }; @@ -317,8 +316,12 @@ 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; |