diff options
| author | Romain Guy <romainguy@google.com> | 2011-10-11 14:51:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-11 14:51:18 -0700 |
| commit | f751210b4b040458df789e217f168bccbb95117a (patch) | |
| tree | 28f9a6db86b00b8bab987a3210eedac9b860ea6e /core/java/android/os | |
| parent | df61887feb5348f1d30a2e86b13ae64c271c4acc (diff) | |
| parent | 4db2504adab21e4439c123d2675db555e0143afa (diff) | |
| download | frameworks_base-f751210b4b040458df789e217f168bccbb95117a.zip frameworks_base-f751210b4b040458df789e217f168bccbb95117a.tar.gz frameworks_base-f751210b4b040458df789e217f168bccbb95117a.tar.bz2 | |
Merge "Fix the build"
Diffstat (limited to 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/AsyncTask.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/java/android/os/AsyncTask.java b/core/java/android/os/AsyncTask.java index 1990935..70ec0af 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; |