commit e9ec5ddb542787b7b5d94d9ea59b05d1f405c5aa
author Daisuke Miyakawa <dmiyakawa@google.com> Sun Jan 16 13:36:09 2011 -0800
committer Daisuke Miyakawa <dmiyakawa@google.com> Sun Jan 16 13:42:33 2011 -0800
tree b70d24d5cbb4a9e18e3f811a14d503f7431d59c3
parent e50c0f7429d6844fedfdbabdfe699f435d9d4da0

Handle null in vCard import

PendingIntent#getActivity() doesn't accept null while
the method allows null.

Bug: 3360839
Change-Id: Ibebaab64b6091679c553f942a48215a8d5b05d3d

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

diff --git a/src/com/android/contacts/vcard/VCardService.java b/src/com/android/contacts/vcard/VCardService.java
index 13d938c..6422163 100644
--- a/src/com/android/contacts/vcard/VCardService.java
+++ b/src/com/android/contacts/vcard/VCardService.java
@@ -486,7 +486,8 @@
                 .setSmallIcon(android.R.drawable.stat_sys_download_done)
                 .setContentTitle(title)
                 .setContentText(description)
-                .setContentIntent(PendingIntent.getActivity(context, 0, intent, 0))
+                .setContentIntent(PendingIntent.getActivity(context, 0,
+                        (intent != null ? intent : new Intent()), 0))
                 .getNotification();
     }