| commit | 4fa9cd0088de76d83803210b39f373cd980fd846 | [log] [tgz] |
|---|---|---|
| author | Dmitri Plotnikov <dplotnikov@google.com> | Fri Dec 10 17:40:38 2010 -0800 |
| committer | Dmitri Plotnikov <dplotnikov@google.com> | Fri Dec 10 17:40:38 2010 -0800 |
| tree | 6c4f9e2b9b503d29d10779afb8720eac71137191 | |
| parent | 545a233ec77db35c966562925b29942aee82b4e7 [diff] |
Fixing NPE in contact editor Bug: 3276044 Change-Id: Id66492cd0e8570bbe9333e5085d65b47f42525eb
diff --git a/src/com/android/contacts/editor/LabeledEditorView.java b/src/com/android/contacts/editor/LabeledEditorView.java index 6d44d15..8b2d277 100644 --- a/src/com/android/contacts/editor/LabeledEditorView.java +++ b/src/com/android/contacts/editor/LabeledEditorView.java
@@ -498,7 +498,7 @@ super(context, 0); mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - if (mType.customColumn != null) { + if (mType != null && mType.customColumn != null) { // Use custom label string when present final String customText = mEntry.getAsString(mType.customColumn);