From be51be6a9917574db9cf8fe69089cdb44d5b1eb3 Mon Sep 17 00:00:00 2001 From: Maurus Cuelenaere Date: Fri, 5 Nov 2010 23:55:20 +0000 Subject: Android: prevent NullPointerException in RockboxService git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28511 a1c6a512-1295-4272-9138-f99709370657 --- android/src/org/rockbox/RockboxService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'android') 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 { LOG("Start Service"); - if (intent.hasExtra("callback")) + if (intent != null && intent.hasExtra("callback")) resultReceiver = (ResultReceiver) intent.getParcelableExtra("callback"); if (!rbLibLoaded) startservice(); -- cgit