diff options
| author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2010-11-05 23:55:20 +0000 |
|---|---|---|
| committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2010-11-05 23:55:20 +0000 |
| commit | be51be6a9917574db9cf8fe69089cdb44d5b1eb3 (patch) | |
| tree | b5f5a2899910e0661601da19fa25483e7f152b7f /android/src/org | |
| parent | 1b477de3cb3b310d79a4addfa566e8c89cf13081 (diff) | |
| download | rockbox-be51be6a9917574db9cf8fe69089cdb44d5b1eb3.tar.gz rockbox-be51be6a9917574db9cf8fe69089cdb44d5b1eb3.zip | |
Android: prevent NullPointerException in RockboxService
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28511 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'android/src/org')
| -rw-r--r-- | android/src/org/rockbox/RockboxService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/src/org/rockbox/RockboxService.java b/android/src/org/rockbox/RockboxService.java index e788251508..4aa7bc1916 100644 --- a/android/src/org/rockbox/RockboxService.java +++ b/android/src/org/rockbox/RockboxService.java | |||
| @@ -110,7 +110,7 @@ public class RockboxService extends Service | |||
| 110 | { | 110 | { |
| 111 | LOG("Start Service"); | 111 | LOG("Start Service"); |
| 112 | 112 | ||
| 113 | if (intent.hasExtra("callback")) | 113 | if (intent != null && intent.hasExtra("callback")) |
| 114 | resultReceiver = (ResultReceiver) intent.getParcelableExtra("callback"); | 114 | resultReceiver = (ResultReceiver) intent.getParcelableExtra("callback"); |
| 115 | if (!rbLibLoaded) | 115 | if (!rbLibLoaded) |
| 116 | startservice(); | 116 | startservice(); |