commit dccb6cfd65b8d120a024bde6b0e31acaf58e743a
author Yorke Lee <yorkelee@google.com> Tue Jan 08 13:17:31 2013 -0800
committer Yorke Lee <yorkelee@google.com> Tue Jan 08 14:34:07 2013 -0800
tree 0e96491fd57597158f276a965f936f64af53bc1b
parent d424359b82360ad98d475696b98f4cdb15474536

Fix NPE in VCardService

Bug: 7967011
Change-Id: Idf53807959a40f164ef0c163479a75988de71e44

src/com/android/contacts/common/vcard/VCardService.java

diff --git a/src/com/android/contacts/common/vcard/VCardService.java b/src/com/android/contacts/common/vcard/VCardService.java
index 07c2a3c..e2adbbd 100644
--- a/src/com/android/contacts/common/vcard/VCardService.java
+++ b/src/com/android/contacts/common/vcard/VCardService.java
@@ -175,8 +175,12 @@
 
     @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;
     }