commit 4a261c84770691214cdf009f0793311382d3c0e5
author Dmitri Plotnikov <dplotnikov@google.com> Mon Apr 05 18:53:05 2010 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Mon Apr 05 18:53:05 2010 -0700
tree bf74b22b301df8469956cc1a0675c4205da92483
parent c4e4995be52859809227badc7ddee5e8979d1ee5

Fixing NPE in phone disambig dialog.

Bug: 2569645
Change-Id: I520cd8c602ca5de3e63d372a6826a34fc97c0dbe

src/com/android/contacts/PhoneDisambigDialog.java

diff --git a/src/com/android/contacts/PhoneDisambigDialog.java b/src/com/android/contacts/PhoneDisambigDialog.java
index 6ce944b..d8cb14e 100644
--- a/src/com/android/contacts/PhoneDisambigDialog.java
+++ b/src/com/android/contacts/PhoneDisambigDialog.java
@@ -156,11 +156,15 @@
             // ContactSource associated with that phone number
             TextView typeView = (TextView)view.findViewById(android.R.id.text1);
             DataKind kind = source.getKindForMimetype(Phone.CONTENT_ITEM_TYPE);
-            ContentValues values = new ContentValues();
-            values.put(Phone.TYPE, item.type);
-            values.put(Phone.LABEL, item.label);
-            StringInflater header = sendSms ? kind.actionAltHeader : kind.actionHeader;
-            typeView.setText(header.inflateUsing(getContext(), values));
+            if (kind != null) {
+                ContentValues values = new ContentValues();
+                values.put(Phone.TYPE, item.type);
+                values.put(Phone.LABEL, item.label);
+                StringInflater header = sendSms ? kind.actionAltHeader : kind.actionHeader;
+                typeView.setText(header.inflateUsing(getContext(), values));
+            } else {
+                typeView.setText(R.string.call_other);
+            }
             return view;
         }
     }