diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2011-10-20 18:55:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-20 18:55:52 -0700 |
| commit | 48188464995a57c381f52f270d818496c8879092 (patch) | |
| tree | 178e634227f05c7961be80b3797ea6c7a3eb1f42 | |
| parent | ecbde824f51a664df3a2d7977c468f77a5ecc6d3 (diff) | |
| parent | f52b953c0acb730289c6f5a664ec5624d6ba5d36 (diff) | |
| download | android_system_media-48188464995a57c381f52f270d818496c8879092.tar.gz android_system_media-48188464995a57c381f52f270d818496c8879092.tar.bz2 android_system_media-48188464995a57c381f52f270d818496c8879092.zip | |
am f52b953c: Fix NPE in AsyncRunner when runner is stopped immediately after start.
* commit 'f52b953c0acb730289c6f5a664ec5624d6ba5d36':
Fix NPE in AsyncRunner when runner is stopped immediately after start.
| -rw-r--r-- | mca/filterfw/java/android/filterfw/core/AsyncRunner.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mca/filterfw/java/android/filterfw/core/AsyncRunner.java b/mca/filterfw/java/android/filterfw/core/AsyncRunner.java index fc16444c..70cbad4c 100644 --- a/mca/filterfw/java/android/filterfw/core/AsyncRunner.java +++ b/mca/filterfw/java/android/filterfw/core/AsyncRunner.java @@ -113,6 +113,11 @@ public class AsyncRunner extends GraphRunner{ protected void onPostExecute(RunnerResult result) { if (mLogVerbose) Log.v(TAG, "Starting post-execute."); setRunning(false); + if (result == null) { + // Cancelled before got to doInBackground + result = new RunnerResult(); + result.status = RESULT_STOPPED; + } setException(result.exception); if (result.status == RESULT_STOPPED || result.status == RESULT_ERROR) { if (mLogVerbose) Log.v(TAG, "Closing filters."); |