diff options
| -rw-r--r-- | src/com/android/contacts/common/vcard/VCardService.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/contacts/common/vcard/VCardService.java b/src/com/android/contacts/common/vcard/VCardService.java index 07c2a3c1..e2adbbde 100644 --- a/src/com/android/contacts/common/vcard/VCardService.java +++ b/src/com/android/contacts/common/vcard/VCardService.java @@ -175,8 +175,12 @@ public class VCardService extends Service { @Override public int onStartCommand(Intent intent, int flags, int id) { - mCallingActivity = intent.getExtras().getString( - VCardCommonArguments.ARG_CALLING_ACTIVITY); + if (intent != null && intent.getExtras() != null) { + mCallingActivity = intent.getExtras().getString( + VCardCommonArguments.ARG_CALLING_ACTIVITY); + } else { + mCallingActivity = null; + } return START_STICKY; } |