commit e7dcdc76925696c584c017481140094b7e51b3f1
author Katherine Kuan <katherinekuan@google.com> Tue Sep 06 12:50:41 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 06 12:50:41 2011 -0700
tree b89aaf6bdc7726707ce969967dfbea8b8eaac7b8
parent 323dd9c6a6c21e60760fc1bf010f90f3918aed06
parent e491b1f517f26b059778bd997f03f4f33fc8c15e

Merge "Fix NPE in ConfirmAddDetailActivity"

src/com/android/contacts/activities/ConfirmAddDetailActivity.java

diff --git a/src/com/android/contacts/activities/ConfirmAddDetailActivity.java b/src/com/android/contacts/activities/ConfirmAddDetailActivity.java
index e97a718..418c8e3 100644
--- a/src/com/android/contacts/activities/ConfirmAddDetailActivity.java
+++ b/src/com/android/contacts/activities/ConfirmAddDetailActivity.java
@@ -714,6 +714,10 @@
 
             EntityDeltaList state = params[0];
 
+            if (state == null) {
+                return RESULT_FAILURE;
+            }
+
             // Trim any empty fields, and RawContacts, before persisting
             EntityModifier.trimEmpty(state, mAccountTypeManager);