Fix NPE in bindEditor
Correctly handle null return values from getMimeEntries()
Bug:12568010
Change-Id: Ic43afb302fa0bdf7852b2247745eaefffa9f7492
diff --git a/src/com/android/contacts/activities/ConfirmAddDetailActivity.java b/src/com/android/contacts/activities/ConfirmAddDetailActivity.java
index d60cc73..3f9116f 100644
--- a/src/com/android/contacts/activities/ConfirmAddDetailActivity.java
+++ b/src/com/android/contacts/activities/ConfirmAddDetailActivity.java
@@ -683,12 +683,15 @@
// Skip kind that are not editable
if (!kind.editable) continue;
if (mMimetype.equals(kind.mimeType)) {
- for (ValuesDelta valuesDelta : mRawContactDelta.getMimeEntries(mMimetype)) {
- // Skip entries that aren't visible
- if (!valuesDelta.isVisible()) continue;
- if (valuesDelta.isInsert()) {
- inflateEditorView(kind, valuesDelta, mRawContactDelta);
- return;
+ final ArrayList<ValuesDelta> deltas = mRawContactDelta.getMimeEntries(mMimetype);
+ if (deltas != null) {
+ for (ValuesDelta valuesDelta : deltas) {
+ // Skip entries that aren't visible
+ if (!valuesDelta.isVisible()) continue;
+ if (valuesDelta.isInsert()) {
+ inflateEditorView(kind, valuesDelta, mRawContactDelta);
+ return;
+ }
}
}
}