diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-01-08 13:17:31 -0800 |
|---|---|---|
| committer | Yorke Lee <yorkelee@google.com> | 2013-01-08 14:34:07 -0800 |
| commit | dccb6cfd65b8d120a024bde6b0e31acaf58e743a (patch) | |
| tree | 0e96491fd57597158f276a965f936f64af53bc1b /src/com/android/contacts/common/vcard/VCardService.java | |
| parent | d424359b82360ad98d475696b98f4cdb15474536 (diff) | |
| download | android_packages_apps_ContactsCommon-dccb6cfd65b8d120a024bde6b0e31acaf58e743a.tar.gz android_packages_apps_ContactsCommon-dccb6cfd65b8d120a024bde6b0e31acaf58e743a.tar.bz2 android_packages_apps_ContactsCommon-dccb6cfd65b8d120a024bde6b0e31acaf58e743a.zip | |
Fix NPE in VCardService
Bug: 7967011
Change-Id: Idf53807959a40f164ef0c163479a75988de71e44
Diffstat (limited to 'src/com/android/contacts/common/vcard/VCardService.java')
| -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; } |