commit 93640fa2b864d83ce15d22f349144972765647a3
author Jeff Sharkey <jsharkey@android.com> Fri Oct 30 13:41:53 2009 -0700
committer Jeff Sharkey <jsharkey@android.com> Fri Oct 30 13:58:54 2009 -0700
tree eb96e476b90b3e4d4cdf5523e95aa8b0ad1df5b8
parent 05fc2e769b3bac38085a78ed7e2ab8a8d83d0932

Avoid NPE in isEmpty() when no EditFields defined.

Fixes http://b/2226220

src/com/android/contacts/model/EntityModifier.java

diff --git a/src/com/android/contacts/model/EntityModifier.java b/src/com/android/contacts/model/EntityModifier.java
index 519ff80..fb3eba7 100644
--- a/src/com/android/contacts/model/EntityModifier.java
+++ b/src/com/android/contacts/model/EntityModifier.java
@@ -409,6 +409,9 @@
      * terms of {@link DataKind#fieldList}.
      */
     public static boolean isEmpty(ValuesDelta values, DataKind kind) {
+        // No defined fields mean this row is always empty
+        if (kind.fieldList == null) return true;
+
         boolean hasValues = false;
         for (EditField field : kind.fieldList) {
             // If any field has values, we're not empty